From 31d0e4bf89ac0bd7facda206413d77b24338f3c2 Mon Sep 17 00:00:00 2001
From: Albert Bofill <abofill@bgeo.es>
Date: Fri, 16 Oct 2020 11:15:45 +0200
Subject: [PATCH] Update qgis templates for ws

---
 metadata.txt                                 |     2 +-
 templates/qgisproject/en/ws_admin.qgs        | 34396 +++++----
 templates/qgisproject/en/ws_admin_sample.qgs | 67024 ++++++++---------
 templates/qgisproject/en/ws_basic.qgs        | 14639 ++--
 templates/qgisproject/en/ws_edit.qgs         | 16171 ++--
 templates/qgisproject/en/ws_epa.qgs          | 25770 +++----
 templates/qgisproject/en/ws_master.qgs       | 28665 +++----
 templates/qgisproject/en/ws_om.qgs           | 16001 ++--
 8 files changed, 101734 insertions(+), 100934 deletions(-)

diff --git a/metadata.txt b/metadata.txt
index 99f124ea7..03a91a7f3 100644
--- a/metadata.txt
+++ b/metadata.txt
@@ -13,7 +13,7 @@ version=3.4.021
 
 author=David Erill, Luigi Pirelli, Natasa Cica, Nestor Ibañez, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Elies Bertran, Abel García Juanes, Xavier Torret
 # End of mandatory metadata
-changelog=Version 3.4.021 (08/10/2020)
+changelog=Version 3.4.021 (16/10/2020)
    - Add multiple documents
    - Bug fix on mincut snapping
    - Enhance search workcat interaction with selectors
diff --git a/templates/qgisproject/en/ws_admin.qgs b/templates/qgisproject/en/ws_admin.qgs
index b88dd0a55..9b4c36900 100644
--- a/templates/qgisproject/en/ws_admin.qgs
+++ b/templates/qgisproject/en/ws_admin.qgs
@@ -20,388 +20,388 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group checked="Qt::Checked" name="O&amp;M" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="O&amp;M">
       <customproperties/>
-      <layer-tree-layer checked="Qt::Unchecked" name="Visits" id="v_edit_om_visit20180201113951439" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" expanded="1">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_om_visit20180201113951439" name="Visits" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group checked="Qt::Checked" name="Mincut analysis" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Mincut analysis">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut init point" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" name="Mincut init point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result valve" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result node" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" name="Mincut result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result connec" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" name="Mincut result connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result valve" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="INVENTORY" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group checked="Qt::Checked" name="Map zones" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Exploitation" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Dma" id="v_edit_dma20190515092620863" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Sector" id="v_edit_sector20171204170540567" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Dqa" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Presszone" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Minsector" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Checked" name="Network" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Node" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Arc" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Connec" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Link" id="v_edit_link20160511142132204" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group checked="Qt::Checked" name="Polygon GROUP" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Fountain polygon" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Register polygon" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Tank polygon" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Checked" name="Other" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Dimensioning" id="v_edit_dimensions20170628134034849" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Element" id="v_edit_element20170828122555146" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Sample point" id="v_edit_samplepoint20170619120830016" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="EDIT" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EDIT">
       <customproperties/>
-      <layer-tree-group checked="Qt::Checked" name="CAD auxiliar layers" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="CAD auxiliar layers">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Circle" id="v_edit_cad_auxcircle20180403155702431" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" id="v_edit_cad_auxcircle20180403155702431" name="Circle" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Point" id="v_edit_cad_auxpoint20180403155702690" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" id="v_edit_cad_auxpoint20180403155702690" name="Point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="EPA" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EPA">
       <customproperties/>
-      <layer-tree-group checked="Qt::Unchecked" name="Input" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Input">
         <customproperties/>
-        <layer-tree-group checked="Qt::Unchecked" name="Node" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Node">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Inp reservoir" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" name="Inp reservoir" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp tank" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" name="Inp tank" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp inlet" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" name="Inp inlet" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp junction" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" name="Inp junction" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Inp mixing" id="inp_mixing20130813215615038" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" checked="Qt::Unchecked" id="inp_mixing20130813215615038" name="Inp mixing" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Inp emitter" id="inp_emitter20130813215614777" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" checked="Qt::Unchecked" id="inp_emitter20130813215614777" name="Inp emitter" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Inp source" id="inp_source20130813215615594" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" checked="Qt::Unchecked" id="inp_source20130813215615594" name="Inp source" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Demand scenario" id="v_edit_inp_demand20180212154336936" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" checked="Qt::Unchecked" id="v_edit_inp_demand20180212154336936" name="Demand scenario" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Arc" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Arc">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Inp virtualvalve" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" name="Inp virtualvalve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp shortpipe" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" name="Inp shortpipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp valve" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" name="Inp valve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp pump" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" name="Inp pump" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp pipe" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" name="Inp pipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Pump additional" id="inp_pump_additional20171218122636750" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" checked="Qt::Unchecked" id="inp_pump_additional20171218122636750" name="Pump additional" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Connec" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Connec">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Inp connec" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" name="Inp connec" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Controls &amp; Rules" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Controls &amp; Rules">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Unchecked" name="Controls arc" id="inp_controls_x_arc20180109103020152" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_controls_x_arc20180109103020152" name="Controls arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Rules arc" id="inp_rules_x_arc20180109103020214" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_arc20180109103020214" name="Rules arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Rules node" id="inp_rules_x_node20180109103020245" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_node20180109103020245" name="Rules node" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Curves &amp; Patterns" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Curves &amp; Patterns">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Curve catalog" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" checked="Qt::Checked" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" name="Curve catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Curve" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" checked="Qt::Checked" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" name="Curve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Patterns catalog" id="inp_pattern20130813215615249" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" checked="Qt::Unchecked" id="inp_pattern20130813215615249" name="Patterns catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Pattern" id="inp_pattern_value20180109135221371" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" checked="Qt::Unchecked" id="inp_pattern_value20180109135221371" name="Pattern" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Quality &amp; Energy" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Quality &amp; Energy">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Energy" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" checked="Qt::Checked" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" name="Energy" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Reactions" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" checked="Qt::Checked" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" name="Reactions" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Quality" id="inp_quality20130813215615383" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" checked="Qt::Unchecked" id="inp_quality20130813215615383" name="Quality" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Output" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Output">
         <customproperties/>
-        <layer-tree-group checked="Qt::Unchecked" name="Result" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Result">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node hourly values" id="v_rpt_node_hourly20180309112715024" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_hourly20180309112715024" name="Node hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node minimum values" id="v_rpt_node20180206173632034" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node20180206173632034" name="Node minimum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node maximum values" id="Node_minimum_values_copy20180206174011431" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="Node_minimum_values_copy20180206174011431" name="Node maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node all values" id="v_rpt_node_all20180309112714890" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_all20180309112714890" name="Node all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc hourly values" id="v_rpt_arc_hourly20180309112714378" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_hourly20180309112714378" name="Arc hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc maximum values" id="v_rpt_arc20180206173632206" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc20180206173632206" name="Arc maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc all values" id="v_rpt_arc_all20180309112714512" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_all20180309112714512" name="Arc all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Energy usage" id="v_rpt_energy_usage20180201122650430" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_energy_usage20180201122650430" name="Energy usage" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Hydraulic status" id="v_rpt_hydraulic_status20131203141738132" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_hydraulic_status20131203141738132" name="Hydraulic status" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Compare result" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Compare result">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node compare hourly values" id="v_rpt_comp_node_hourly20180309112714764" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_hourly20180309112714764" name="Node compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node minimum values compare" id="v_rpt_comp_node20160710012004695" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node20160710012004695" name="Node minimum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node maximum values compare" id="v_rpt_comp_node_copiar20161230144859228" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_copiar20161230144859228" name="Node maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc compare hourly values" id="v_rpt_comp_arc_hourly20180309112714639" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc_hourly20180309112714639" name="Arc compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc maximum values compare" id="v_rpt_comp_arc20160710012004554" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc20160710012004554" name="Arc maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Energy usage compare" id="v_rpt_comp_energy_usage20160710012004617" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_energy_usage20160710012004617" name="Energy usage compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Hydraulic status compare" id="v_rpt_comp_hydraulic_status20160710012004648" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_hydraulic_status20160710012004648" name="Hydraulic status compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="MASTERPLAN" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="MASTERPLAN">
       <customproperties/>
-      <layer-tree-group checked="Qt::Unchecked" name="Network value" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Network value">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Unchecked" name="Plan result node" id="v_plan_result_node20180112102743460" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_node&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_plan_result_node20180112102743460" name="Plan result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Plan result arc" id="v_plan_result_arc20180112102742726" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_arc&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_plan_result_arc20180112102742726" name="Plan result arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Arc x pavement" id="plan_arc_x_pavement20160710012151609" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;plan_arc_x_pavement&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;plan_arc_x_pavement&quot; sql=" checked="Qt::Unchecked" id="plan_arc_x_pavement20160710012151609" name="Arc x pavement" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Psectors" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Psectors">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Unchecked" name="Plan psector" id="v_edit_plan_psector20170627152846650" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_plan_psector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_plan_psector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_plan_psector20170627152846650" name="Plan psector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Current psector" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_current_psector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_current_psector&quot; (the_geom) sql=" checked="Qt::Checked" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" name="Current psector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Prices" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Prices">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Prices" id="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price&quot; sql=" checked="Qt::Checked" id="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" name="Prices" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Compost prices" id="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price_compost&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price_compost&quot; sql=" checked="Qt::Checked" id="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" name="Compost prices" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="ADMIN" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="ADMIN">
       <customproperties/>
-      <layer-tree-group checked="Qt::Unchecked" name="Other Mapzones" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Other Mapzones">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Macroexploitation" id="macroexploitation20171207121804523" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macroexpl_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;macroexploitation&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macroexpl_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;macroexploitation&quot; sql=" checked="Qt::Checked" id="macroexploitation20171207121804523" name="Macroexploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Macrodma" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodma&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" name="Macrodma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Macrosector" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrosector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrosector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrosector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrosector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" name="Macrosector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Macrodqa" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodqa&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" name="Macrodqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Catalogs" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Catalogs">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Node material catalog" id="cat_mat_node20160224165702530" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" checked="Qt::Checked" id="cat_mat_node20160224165702530" name="Node material catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Arc material catalog" id="cat_mat_arc20160224165702501" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" checked="Qt::Checked" id="cat_mat_arc20160224165702501" name="Arc material catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Node catalog" id="cat_node20151105202206790" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" checked="Qt::Checked" id="cat_node20151105202206790" name="Node catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Arc catalog" id="cat_arc20151120192002466" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" checked="Qt::Checked" id="cat_arc20151120192002466" name="Arc catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Roughness catalog" id="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_roughness&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_roughness&quot; sql=" checked="Qt::Checked" id="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" name="Roughness catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Connec catalog" id="cat_connec20160216122620764" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" checked="Qt::Checked" id="cat_connec20160216122620764" name="Connec catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Element material catalog" id="cat_mat_element20160224165702516" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" checked="Qt::Checked" id="cat_mat_element20160224165702516" name="Element material catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Element catalog" id="cat_element20160224165938446" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" checked="Qt::Checked" id="cat_element20160224165938446" name="Element catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Owner catalog" id="cat_owner20160224165938429" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" checked="Qt::Checked" id="cat_owner20160224165938429" name="Owner catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Soil catalog" id="cat_soil20151105202206837" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" checked="Qt::Checked" id="cat_soil20151105202206837" name="Soil catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Pavement catalog" id="cat_pavement20170111155456255" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" checked="Qt::Checked" id="cat_pavement20170111155456255" name="Pavement catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Work catalog" id="cat_work20160216122620842" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" checked="Qt::Checked" id="cat_work20160216122620842" name="Work catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Builder catalog" id="cat_builder20160216122620733" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" checked="Qt::Checked" id="cat_builder20160216122620733" name="Builder catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Brand model catalog" id="cat_brand_model20180131084332427" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" checked="Qt::Checked" id="cat_brand_model20180131084332427" name="Brand model catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Brand catalog" id="cat_brand20180131084235586" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" checked="Qt::Checked" id="cat_brand20180131084235586" name="Brand catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Users catalog" id="cat_users20180131084332505" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" checked="Qt::Checked" id="cat_users20180131084332505" name="Users catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Period catalog" id="ext_cat_period20160703033754677" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_period&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_period&quot; sql=" checked="Qt::Unchecked" id="ext_cat_period20160703033754677" name="Period catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Hydrometer catalog" id="ext_cat_hydrometer20160703033754739" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_hydrometer&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_hydrometer&quot; sql=" checked="Qt::Unchecked" id="ext_cat_hydrometer20160703033754739" name="Hydrometer catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" name="Config Forms" id="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_config_sysfields&quot; sql=" expanded="1">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_config_sysfields&quot; sql=" checked="Qt::Checked" id="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" name="Config Forms" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="BASEMAP" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group checked="Qt::Checked" name="Address" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Municipality" id="ext_municipality20171204170633784" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Address" id="v_ext_address20180201103159332" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Streetaxis" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Plot" id="v_ext_plot20180201103159443" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -465,72 +465,71 @@
       <item>v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a</item>
       <item>v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3</item>
       <item>v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e</item>
-      <item>ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a</item>
     </custom-order>
   </layer-tree-group>
   <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_om_visit20180201113951439"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_arc_all20180309112714512"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_node_all20180309112714890"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_plan_result_node20180112102743460"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_arc_hourly20180309112714378"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_arc_hourly20180309112714639"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_element20170828122555146"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_arc20160710012004554"/>
-      <layer-setting tolerance="1" type="1" units="0" enabled="1" id="v_edit_dimensions20170628134034849"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_node_copiar20161230144859228"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_ext_plot20180201103159443"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_node_hourly20180309112715024"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_ext_address20180201103159332"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_arc20180206173632206"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b"/>
-      <layer-setting tolerance="1" type="1" units="0" enabled="1" id="ext_municipality20171204170633784"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_node20160710012004695"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e"/>
-      <layer-setting tolerance="15" type="2" units="1" enabled="1" id="v_edit_link20160511142132204"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="Node_minimum_values_copy20180206174011431"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_sector20171204170540567"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_plan_result_arc20180112102742726"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_plan_psector20170627152846650"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_dma20190515092620863"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_samplepoint20170619120830016"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_node20180206173632034"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_node_hourly20180309112714764"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node20180206173632034" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_om_visit20180201113951439" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_plan_result_arc20180112102742726" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_hourly20180309112714764" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc20180206173632206" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_all20180309112714512" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc20160710012004554" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_hourly20180309112715024" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_hourly20180309112714378" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="Node_minimum_values_copy20180206174011431" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node20160710012004695" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc_hourly20180309112714639" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_plan_result_node20180112102743460" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_all20180309112714890" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_plan_psector20170627152846650" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_copiar20161230144859228" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>meters</units>
     <extent>
       <xmin>__XMIN__</xmin>
@@ -557,555 +556,555 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" checked="Qt::Checked" name="O&amp;M">
-      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Visits" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="v_edit_om_visit20180201113951439" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Checked" name="O&amp;M" open="false">
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Visits" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="v_edit_om_visit20180201113951439" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="false" checked="Qt::Checked" name="Mincut analysis">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut init point" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0" visible="1"/>
+      <legendgroup checked="Qt::Checked" name="Mincut analysis" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut init point" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Mincut result valve" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut result node" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result node" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut result connec" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result connec" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut result valve" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="INVENTORY">
-      <legendgroup open="false" checked="Qt::Checked" name="Map zones">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Exploitation" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Dma" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_dma20190515092620863" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Sector" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_sector20171204170540567" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Dqa" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Presszone" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Minsector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" checked="Qt::Checked" name="Network">
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Node" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0" visible="1"/>
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Arc" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Connec" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Link" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_link20160511142132204" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" checked="Qt::Checked" name="Polygon GROUP">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Fountain polygon" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0" visible="1"/>
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Register polygon" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0" visible="1"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Tank polygon" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0" visible="1"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" checked="Qt::Checked" name="Other">
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Dimensioning" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_dimensions20170628134034849" isInOverview="0" visible="1"/>
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Element" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_element20170828122555146" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Sample point" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_samplepoint20170619120830016" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="EDIT">
-      <legendgroup open="false" checked="Qt::Checked" name="CAD auxiliar layers">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Circle" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="EDIT" open="false">
+      <legendgroup checked="Qt::Checked" name="CAD auxiliar layers" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Circle" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Point" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Point" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="EPA">
-      <legendgroup open="true" checked="Qt::Unchecked" name="Input">
-        <legendgroup open="false" checked="Qt::Unchecked" name="Node">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp reservoir" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="EPA" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Input" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Node" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp reservoir" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp tank" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp tank" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp inlet" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp inlet" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp junction" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp junction" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Inp mixing" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_mixing20130813215615038" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp mixing" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_mixing20130813215615038" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Inp emitter" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_emitter20130813215614777" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp emitter" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_emitter20130813215614777" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Inp source" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_source20130813215615594" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp source" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_source20130813215615594" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Demand scenario" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_demand20180212154336936" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Demand scenario" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_demand20180212154336936" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Arc">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp virtualvalve" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Arc" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp virtualvalve" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp shortpipe" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp shortpipe" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp valve" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp valve" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp pump" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pump" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp pipe" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pipe" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Pump additional" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_pump_additional20171218122636750" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pump additional" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_pump_additional20171218122636750" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Connec">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp connec" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Connec" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp connec" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Controls &amp; Rules">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Controls arc" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_controls_x_arc20180109103020152" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Controls &amp; Rules" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Controls arc" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_controls_x_arc20180109103020152" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Rules arc" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_rules_x_arc20180109103020214" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules arc" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_rules_x_arc20180109103020214" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Rules node" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_rules_x_node20180109103020245" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules node" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_rules_x_node20180109103020245" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Curves &amp; Patterns">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Curve catalog" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Curves &amp; Patterns" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve catalog" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Curve" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Patterns catalog" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_pattern20130813215615249" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Patterns catalog" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_pattern20130813215615249" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Pattern" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_pattern_value20180109135221371" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pattern" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_pattern_value20180109135221371" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Quality &amp; Energy">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Energy" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Quality &amp; Energy" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Energy" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Reactions" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Reactions" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Quality" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_quality20130813215615383" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Quality" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_quality20130813215615383" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" checked="Qt::Unchecked" name="Output">
-        <legendgroup open="false" checked="Qt::Unchecked" name="Result">
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node hourly values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_node_hourly20180309112715024" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Output" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node hourly values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_node_hourly20180309112715024" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node minimum values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_node20180206173632034" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_node20180206173632034" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node maximum values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="Node_minimum_values_copy20180206174011431" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="Node_minimum_values_copy20180206174011431" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node all values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_node_all20180309112714890" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node all values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_node_all20180309112714890" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc hourly values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_arc_hourly20180309112714378" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc hourly values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_arc_hourly20180309112714378" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc maximum values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_arc20180206173632206" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_arc20180206173632206" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Arc all values" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_arc_all20180309112714512" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc all values" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_arc_all20180309112714512" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Energy usage" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_energy_usage20180201122650430" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_energy_usage20180201122650430" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Hydraulic status" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_hydraulic_status20131203141738132" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_hydraulic_status20131203141738132" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Compare result">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Node compare hourly values" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_node_hourly20180309112714764" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Compare result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node compare hourly values" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_node_hourly20180309112714764" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node minimum values compare" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_node20160710012004695" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values compare" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_node20160710012004695" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node maximum values compare" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_node_copiar20161230144859228" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_node_copiar20161230144859228" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc compare hourly values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_arc_hourly20180309112714639" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc compare hourly values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_arc_hourly20180309112714639" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc maximum values compare" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_arc20160710012004554" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_arc20160710012004554" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Energy usage compare" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_energy_usage20160710012004617" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage compare" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_energy_usage20160710012004617" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Hydraulic status compare" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_hydraulic_status20160710012004648" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status compare" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_hydraulic_status20160710012004648" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="MASTERPLAN">
-      <legendgroup open="false" checked="Qt::Unchecked" name="Network value">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Plan result node" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_plan_result_node20180112102743460" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="MASTERPLAN" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Network value" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan result node" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_plan_result_node20180112102743460" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Plan result arc" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_plan_result_arc20180112102742726" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan result arc" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_plan_result_arc20180112102742726" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Arc x pavement" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="plan_arc_x_pavement20160710012151609" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc x pavement" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="plan_arc_x_pavement20160710012151609" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" checked="Qt::Unchecked" name="Psectors">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Plan psector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_plan_psector20170627152846650" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Psectors" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan psector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_plan_psector20170627152846650" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Current psector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Current psector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" checked="Qt::Unchecked" name="Prices">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Prices" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Prices" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Prices" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Compost prices" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Compost prices" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="ADMIN">
-      <legendgroup open="false" checked="Qt::Unchecked" name="Other Mapzones">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Macroexploitation" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="macroexploitation20171207121804523" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="ADMIN" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Other Mapzones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Macroexploitation" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="macroexploitation20171207121804523" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Macrodma" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Macrodma" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Macrosector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Macrosector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Macrodqa" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Macrodqa" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="false" checked="Qt::Unchecked" name="Catalogs">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Node material catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_node20160224165702530" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Catalogs" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node material catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_node20160224165702530" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Arc material catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_arc20160224165702501" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc material catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_arc20160224165702501" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Node catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_node20151105202206790" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_node20151105202206790" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Arc catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_arc20151120192002466" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_arc20151120192002466" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Roughness catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Roughness catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Connec catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_connec20160216122620764" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_connec20160216122620764" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Element material catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_element20160224165702516" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Element material catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_element20160224165702516" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Element catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_element20160224165938446" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Element catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_element20160224165938446" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Owner catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_owner20160224165938429" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Owner catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_owner20160224165938429" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Soil catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_soil20151105202206837" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Soil catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_soil20151105202206837" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Pavement catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_pavement20170111155456255" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Pavement catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_pavement20170111155456255" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Work catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_work20160216122620842" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Work catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_work20160216122620842" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Builder catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_builder20160216122620733" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Builder catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_builder20160216122620733" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Brand model catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_brand_model20180131084332427" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Brand model catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_brand_model20180131084332427" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Brand catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_brand20180131084235586" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Brand catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_brand20180131084235586" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Users catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_users20180131084332505" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Users catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_users20180131084332505" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Period catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="ext_cat_period20160703033754677" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Period catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="ext_cat_period20160703033754677" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Hydrometer catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="ext_cat_hydrometer20160703033754739" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydrometer catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="ext_cat_hydrometer20160703033754739" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Config Forms" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Config Forms" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Checked" name="BASEMAP">
-      <legendgroup open="true" checked="Qt::Checked" name="Address">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Municipality" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="ext_municipality20171204170633784" isInOverview="1" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Address" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_ext_address20180201103159332" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Streetaxis" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Plot" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_ext_plot20180201103159443" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
@@ -1113,83 +1112,8 @@
   </legend>
   <mapViewDocks/>
   <mapViewDocks3D/>
-  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
-    <units>degrees</units>
-    <extent>
-      <xmin>__XMIN__</xmin>
-      <ymin>__YMIN__</ymin>
-      <xmax>__XMAX__</xmax>
-      <ymax>__YMAX__</ymax>
-    </extent>
-    <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>
-        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-        <srsid>3452</srsid>
-        <srid>4326</srid>
-        <authid>EPSG:4326</authid>
-        <description>WGS 84</description>
-        <projectionacronym>longlat</projectionacronym>
-        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
-      </spatialrefsys>
-    </destinationsrs>
-    <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
-  </mapcanvas>
-  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
-    <units>degrees</units>
-    <extent>
-      <xmin>__XMIN__</xmin>
-      <ymin>__YMIN__</ymin>
-      <xmax>__XMAX__</xmax>
-      <ymax>__YMAX__</ymax>
-    </extent>
-    <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>
-        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-        <srsid>3452</srsid>
-        <srid>4326</srid>
-        <authid>EPSG:4326</authid>
-        <description>WGS 84</description>
-        <projectionacronym>longlat</projectionacronym>
-        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
-      </spatialrefsys>
-    </destinationsrs>
-    <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
-  </mapcanvas>
-  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
-    <units>degrees</units>
-    <extent>
-      <xmin>__XMIN__</xmin>
-      <ymin>__YMIN__</ymin>
-      <xmax>__XMAX__</xmax>
-      <ymax>__YMAX__</ymax>
-    </extent>
-    <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>
-        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-        <srsid>3452</srsid>
-        <srid>4326</srid>
-        <authid>EPSG:4326</authid>
-        <description>WGS 84</description>
-        <projectionacronym>longlat</projectionacronym>
-        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
-      </spatialrefsys>
-    </destinationsrs>
-    <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
-  </mapcanvas>
   <projectlayers>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>Node_minimum_values_copy20180206174011431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -1229,7 +1153,7 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -1249,202 +1173,202 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -1452,49 +1376,49 @@
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -1506,28 +1430,28 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1536,8 +1460,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1546,8 +1470,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1556,8 +1480,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1566,8 +1490,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1576,8 +1500,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1586,8 +1510,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1603,8 +1527,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1620,8 +1544,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1637,8 +1561,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1652,81 +1576,81 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="node_type"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="elevation"/>
-        <alias index="5" name="" field="max_demand"/>
-        <alias index="6" name="" field="min_demand"/>
-        <alias index="7" name="" field="max_head"/>
-        <alias index="8" name="" field="min_head"/>
-        <alias index="9" name="" field="max_pressure"/>
-        <alias index="10" name="" field="min_pressure"/>
-        <alias index="11" name="" field="max_quality"/>
-        <alias index="12" name="" field="min_quality"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="node_type" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="elevation" name="" index="4"/>
+        <alias field="max_demand" name="" index="5"/>
+        <alias field="min_demand" name="" index="6"/>
+        <alias field="max_head" name="" index="7"/>
+        <alias field="min_head" name="" index="8"/>
+        <alias field="max_pressure" name="" index="9"/>
+        <alias field="min_pressure" name="" index="10"/>
+        <alias field="max_quality" name="" index="11"/>
+        <alias field="min_quality" name="" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1763,7 +1687,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="-4.65661e-10" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="-4.65661e-10" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_arc20151120192002466</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_arc" sql=</datasource>
       <keywordList>
@@ -1812,11 +1736,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -1846,7 +1770,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1855,36 +1779,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="arctype_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="PIPE" name="PIPE"/>
-                  <Option type="QString" value="VARC" name="VARC"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="FC" name="Fiberconcret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="PE-HD" name="PE high density"/>
-                  <Option type="QString" value="PE-LD" name="PE low density"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1893,8 +1809,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1903,8 +1819,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1913,8 +1829,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1923,8 +1839,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1933,8 +1849,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1943,37 +1859,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1982,8 +1889,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -1992,8 +1899,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2002,8 +1909,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2012,8 +1919,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2022,8 +1929,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2032,8 +1939,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2042,343 +1949,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_unit">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="kg" name="kg"/>
-                  <Option type="QString" value="m" name="m"/>
-                  <Option type="QString" value="m2" name="m2"/>
-                  <Option type="QString" value="m3" name="m3"/>
-                  <Option type="QString" value="pa" name="pa"/>
-                  <Option type="QString" value="t" name="t"/>
-                  <Option type="QString" value="u" name="u"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m2bottom_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3protec_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2387,8 +1999,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -2397,182 +2009,185 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="shape">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CIRCULAR" name="CIRCULAR"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="arctype_id" field="arctype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="" field="pnom"/>
-        <alias index="4" name="" field="dnom"/>
-        <alias index="5" name="" field="dint"/>
-        <alias index="6" name="" field="dext"/>
-        <alias index="7" name="" field="descript"/>
-        <alias index="8" name="" field="link"/>
-        <alias index="9" name="brand" field="brand"/>
-        <alias index="10" name="model" field="model"/>
-        <alias index="11" name="" field="svg"/>
-        <alias index="12" name="" field="z1"/>
-        <alias index="13" name="" field="z2"/>
-        <alias index="14" name="" field="width"/>
-        <alias index="15" name="" field="area"/>
-        <alias index="16" name="" field="estimated_depth"/>
-        <alias index="17" name="" field="bulk"/>
-        <alias index="18" name="cost_unit" field="cost_unit"/>
-        <alias index="19" name="cost" field="cost"/>
-        <alias index="20" name="m2bottom_cost" field="m2bottom_cost"/>
-        <alias index="21" name="m3protec_cost" field="m3protec_cost"/>
-        <alias index="22" name="" field="active"/>
-        <alias index="23" name="" field="label"/>
-        <alias index="24" name="shape" field="shape"/>
-        <alias index="25" name="" field="acoeff"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="arctype_id" name="arctype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="pnom" name="" index="3"/>
+        <alias field="dnom" name="" index="4"/>
+        <alias field="dint" name="" index="5"/>
+        <alias field="dext" name="" index="6"/>
+        <alias field="descript" name="" index="7"/>
+        <alias field="link" name="" index="8"/>
+        <alias field="brand" name="brand" index="9"/>
+        <alias field="model" name="model" index="10"/>
+        <alias field="svg" name="" index="11"/>
+        <alias field="z1" name="" index="12"/>
+        <alias field="z2" name="" index="13"/>
+        <alias field="width" name="" index="14"/>
+        <alias field="area" name="" index="15"/>
+        <alias field="estimated_depth" name="" index="16"/>
+        <alias field="bulk" name="" index="17"/>
+        <alias field="cost_unit" name="cost_unit" index="18"/>
+        <alias field="cost" name="cost" index="19"/>
+        <alias field="m2bottom_cost" name="m2bottom_cost" index="20"/>
+        <alias field="m3protec_cost" name="m3protec_cost" index="21"/>
+        <alias field="active" name="" index="22"/>
+        <alias field="label" name="" index="23"/>
+        <alias field="shape" name="shape" index="24"/>
+        <alias field="acoeff" name="" index="25"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arctype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="pnom" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="dint" applyOnUpdate="0"/>
-        <default expression="" field="dext" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="z1" applyOnUpdate="0"/>
-        <default expression="" field="z2" applyOnUpdate="0"/>
-        <default expression="" field="width" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="estimated_depth" applyOnUpdate="0"/>
-        <default expression="" field="bulk" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="m2bottom_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3protec_cost" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="shape" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="pnom" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="dint" expression=""/>
+        <default applyOnUpdate="0" field="dext" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="z1" expression=""/>
+        <default applyOnUpdate="0" field="z2" expression=""/>
+        <default applyOnUpdate="0" field="width" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="estimated_depth" expression=""/>
+        <default applyOnUpdate="0" field="bulk" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="m2bottom_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="shape" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arctype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dint"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="width"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="estimated_depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="bulk"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2bottom_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3protec_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shape"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dint" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="width" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="area" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="estimated_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="bulk" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2bottom_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shape" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arctype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="pnom"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="dint"/>
-        <constraint desc="" exp="" field="dext"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="z1"/>
-        <constraint desc="" exp="" field="z2"/>
-        <constraint desc="" exp="" field="width"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="estimated_depth"/>
-        <constraint desc="" exp="" field="bulk"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="m2bottom_cost"/>
-        <constraint desc="" exp="" field="m3protec_cost"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="shape"/>
-        <constraint desc="" exp="" field="acoeff"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arctype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="pnom" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="dint" desc=""/>
+        <constraint exp="" field="dext" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="z1" desc=""/>
+        <constraint exp="" field="z2" desc=""/>
+        <constraint exp="" field="width" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="estimated_depth" desc=""/>
+        <constraint exp="" field="bulk" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="m2bottom_cost" desc=""/>
+        <constraint exp="" field="m3protec_cost" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="shape" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{bd2b7151-8197-40f6-a47f-4600e8e700a0}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{922ecae5-8ab4-480b-a7a9-c5c80cff4ee5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arctype_id" width="-1"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="pnom" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="dint" width="-1"/>
-          <column type="field" hidden="0" name="dext" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="159"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="148"/>
-          <column type="field" hidden="0" name="z1" width="-1"/>
-          <column type="field" hidden="0" name="z2" width="-1"/>
-          <column type="field" hidden="0" name="width" width="-1"/>
-          <column type="field" hidden="0" name="area" width="-1"/>
-          <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-          <column type="field" hidden="0" name="bulk" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="-1"/>
-          <column type="field" hidden="0" name="m2bottom_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3protec_cost" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="shape" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="pnom"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="dint"/>
+          <column type="field" width="-1" hidden="0" name="dext"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="159" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="148" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="z1"/>
+          <column type="field" width="-1" hidden="0" name="z2"/>
+          <column type="field" width="-1" hidden="0" name="width"/>
+          <column type="field" width="-1" hidden="0" name="area"/>
+          <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+          <column type="field" width="-1" hidden="0" name="bulk"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="shape"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2604,6 +2219,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
         <field name="active" editable="1"/>
         <field name="arctype_id" editable="1"/>
         <field name="area" editable="1"/>
@@ -2631,6 +2247,7 @@ def my_form_open(dialog, layer, feature):
         <field name="z2" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
         <field labelOnTop="0" name="active"/>
         <field labelOnTop="0" name="arctype_id"/>
         <field labelOnTop="0" name="area"/>
@@ -2661,7 +2278,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_brand20180131084235586</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_brand" sql=</datasource>
       <keywordList>
@@ -2701,7 +2318,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2722,7 +2339,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2738,8 +2355,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2753,35 +2370,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2806,7 +2423,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_brand_model20180131084332427</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_brand_model" sql=</datasource>
       <keywordList>
@@ -2833,6 +2450,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -2846,10 +2472,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -2866,28 +2500,32 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="catbrand_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2896,55 +2534,60 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="catbrand_id" field="catbrand_id"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="catbrand_id" name="catbrand_id" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="link" name="link" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="catbrand_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="catbrand_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="catbrand_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="catbrand_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="catbrand_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="catbrand_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="catbrand_id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="catbrand_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2956,7 +2599,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -2965,12 +2624,17 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
         <field name="link" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="catbrand_id"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="link"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_builder20160216122620733</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_builder" sql=</datasource>
       <keywordList>
@@ -3010,7 +2674,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3031,7 +2695,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3047,8 +2711,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3062,41 +2726,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{b3a4944a-b906-40e7-ad7a-032f91a9a469}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{b3a4944a-b906-40e7-ad7a-032f91a9a469}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3121,7 +2785,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_connec20160216122620764</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_connec" sql=</datasource>
       <keywordList>
@@ -3170,11 +2834,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -3203,7 +2867,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3212,39 +2876,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="connectype_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="FOUNTAIN" name="FOUNTAIN"/>
-                  <Option type="QString" value="GREENTAP" name="GREENTAP"/>
-                  <Option type="QString" value="TAP" name="TAP"/>
-                  <Option type="QString" value="VCONNEC" name="VCONNEC"/>
-                  <Option type="QString" value="WJOIN" name="WJOIN"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CC" name="Concret"/>
-                  <Option type="QString" value="FC" name="Fiberconcret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="FD-FD-PVC" name="Iron-Iron-PVC"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3253,8 +2906,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3263,8 +2916,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3273,8 +2926,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3283,8 +2936,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3293,8 +2946,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3303,362 +2956,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="svg">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_ut">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_ml">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_m3">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3667,8 +3026,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -3677,120 +3036,120 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="connectype_id" field="connectype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="pnom" field="pnom"/>
-        <alias index="4" name="dnom" field="dnom"/>
-        <alias index="5" name="dint" field="dint"/>
-        <alias index="6" name="dext" field="dext"/>
-        <alias index="7" name="descript" field="descript"/>
-        <alias index="8" name="link" field="link"/>
-        <alias index="9" name="brand" field="brand"/>
-        <alias index="10" name="model" field="model"/>
-        <alias index="11" name="svg" field="svg"/>
-        <alias index="12" name="cost_ut" field="cost_ut"/>
-        <alias index="13" name="cost_ml" field="cost_ml"/>
-        <alias index="14" name="cost_m3" field="cost_m3"/>
-        <alias index="15" name="active" field="active"/>
-        <alias index="16" name="label" field="label"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="connectype_id" name="connectype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="pnom" name="pnom" index="3"/>
+        <alias field="dnom" name="dnom" index="4"/>
+        <alias field="dint" name="dint" index="5"/>
+        <alias field="dext" name="dext" index="6"/>
+        <alias field="descript" name="descript" index="7"/>
+        <alias field="link" name="link" index="8"/>
+        <alias field="brand" name="brand" index="9"/>
+        <alias field="model" name="model" index="10"/>
+        <alias field="svg" name="svg" index="11"/>
+        <alias field="cost_ut" name="cost_ut" index="12"/>
+        <alias field="cost_ml" name="cost_ml" index="13"/>
+        <alias field="cost_m3" name="cost_m3" index="14"/>
+        <alias field="active" name="active" index="15"/>
+        <alias field="label" name="label" index="16"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="pnom" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="dint" applyOnUpdate="0"/>
-        <default expression="" field="dext" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="cost_ut" applyOnUpdate="0"/>
-        <default expression="" field="cost_ml" applyOnUpdate="0"/>
-        <default expression="" field="cost_m3" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="pnom" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="dint" expression=""/>
+        <default applyOnUpdate="0" field="dext" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="cost_ut" expression=""/>
+        <default applyOnUpdate="0" field="cost_ml" expression=""/>
+        <default applyOnUpdate="0" field="cost_m3" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dint"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_ut"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_ml"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_m3"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dint" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_ut" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_ml" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_m3" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="pnom"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="dint"/>
-        <constraint desc="" exp="" field="dext"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="cost_ut"/>
-        <constraint desc="" exp="" field="cost_ml"/>
-        <constraint desc="" exp="" field="cost_m3"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="label"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="pnom" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="dint" desc=""/>
+        <constraint exp="" field="dext" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="cost_ut" desc=""/>
+        <constraint exp="" field="cost_ml" desc=""/>
+        <constraint exp="" field="cost_m3" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="label" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{972bc6f0-7544-41c6-9dd5-798648a4c3cd}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{9b51f506-29f1-48fd-a506-f089b9aa881b}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="132"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="pnom" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="dint" width="-1"/>
-          <column type="field" hidden="0" name="dext" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="cost_ut" width="140"/>
-          <column type="field" hidden="0" name="cost_ml" width="-1"/>
-          <column type="field" hidden="0" name="cost_m3" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
+          <column type="field" width="132" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="pnom"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="dint"/>
+          <column type="field" width="-1" hidden="0" name="dext"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="140" hidden="0" name="cost_ut"/>
+          <column type="field" width="-1" hidden="0" name="cost_ml"/>
+          <column type="field" width="-1" hidden="0" name="cost_m3"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3863,7 +3222,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_element20160224165938446</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_element" sql=</datasource>
       <keywordList>
@@ -3912,11 +3271,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -3945,7 +3304,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3954,38 +3313,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementtype_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="COVER" name="COVER"/>
-                  <Option type="QString" value="MANHOLE" name="MANHOLE"/>
-                  <Option type="QString" value="PROTECT_BAND" name="PROTECT_BAND"/>
-                  <Option type="QString" value="REGISTER" name="REGISTER"/>
-                  <Option type="QString" value="STEP" name="STEP"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="BRICK+IRON" name="Brick and iron"/>
-                  <Option type="QString" value="CONCRET" name="Concret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3994,8 +3343,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4004,8 +3353,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4014,44 +3363,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4060,8 +3403,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4070,90 +3413,135 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="geom1">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="geom2">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="isdoublegeom">
+          <editWidget type="CheckBox">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="elementtype_id" field="elementtype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="geometry" field="geometry"/>
-        <alias index="4" name="descript" field="descript"/>
-        <alias index="5" name="link" field="link"/>
-        <alias index="6" name="brand" field="brand"/>
-        <alias index="7" name="type" field="type"/>
-        <alias index="8" name="model" field="model"/>
-        <alias index="9" name="svg" field="svg"/>
-        <alias index="10" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="elementtype_id" name="elementtype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="geometry" name="geometry" index="3"/>
+        <alias field="descript" name="descript" index="4"/>
+        <alias field="link" name="link" index="5"/>
+        <alias field="brand" name="brand" index="6"/>
+        <alias field="type" name="type" index="7"/>
+        <alias field="model" name="model" index="8"/>
+        <alias field="svg" name="svg" index="9"/>
+        <alias field="active" name="active" index="10"/>
+        <alias field="geom1" name="" index="11"/>
+        <alias field="geom2" name="" index="12"/>
+        <alias field="isdoublegeom" name="" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="elementtype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="geometry" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="geometry" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="geom1" expression=""/>
+        <default applyOnUpdate="0" field="geom2" expression=""/>
+        <default applyOnUpdate="0" field="isdoublegeom" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elementtype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geometry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geometry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isdoublegeom" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="elementtype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="geometry"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="geometry" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="geom1" desc=""/>
+        <constraint exp="" field="geom2" desc=""/>
+        <constraint exp="" field="isdoublegeom" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{7fe24c5b-ce25-45fc-8efb-d2a220b33de3}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5b736c83-87a9-4860-a678-413de71f8ec5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="elementtype_id" width="-1"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="geometry" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="type" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="geometry"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="geom1"/>
+          <column type="field" width="-1" hidden="0" name="geom2"/>
+          <column type="field" width="-1" hidden="0" name="isdoublegeom"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4189,8 +3577,11 @@ def my_form_open(dialog, layer, feature):
         <field name="brand" editable="1"/>
         <field name="descript" editable="1"/>
         <field name="elementtype_id" editable="1"/>
+        <field name="geom1" editable="1"/>
+        <field name="geom2" editable="1"/>
         <field name="geometry" editable="1"/>
         <field name="id" editable="1"/>
+        <field name="isdoublegeom" editable="1"/>
         <field name="link" editable="1"/>
         <field name="matcat_id" editable="1"/>
         <field name="model" editable="1"/>
@@ -4202,8 +3593,11 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="brand"/>
         <field labelOnTop="0" name="descript"/>
         <field labelOnTop="0" name="elementtype_id"/>
+        <field labelOnTop="0" name="geom1"/>
+        <field labelOnTop="0" name="geom2"/>
         <field labelOnTop="0" name="geometry"/>
         <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="isdoublegeom"/>
         <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="matcat_id"/>
         <field labelOnTop="0" name="model"/>
@@ -4214,7 +3608,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_arc20160224165702501</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_arc" sql=</datasource>
       <keywordList>
@@ -4254,7 +3648,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4275,7 +3669,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4291,8 +3685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4306,41 +3700,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{683581f4-e181-475e-9eeb-908337188d7c}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{683581f4-e181-475e-9eeb-908337188d7c}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4365,7 +3759,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_element20160224165702516</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_element" sql=</datasource>
       <keywordList>
@@ -4405,7 +3799,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4426,7 +3820,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4442,8 +3836,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4457,41 +3851,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{3168fb2f-03de-4dfe-be8a-cd5c9dc8b602}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{3168fb2f-03de-4dfe-be8a-cd5c9dc8b602}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="167"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="167" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4516,7 +3910,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_node20160224165702530</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_node" sql=</datasource>
       <keywordList>
@@ -4556,7 +3950,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4577,7 +3971,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4593,8 +3987,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4608,42 +4002,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{d9c904a6-1220-41c6-ae30-b39bc59ed216}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{d9c904a6-1220-41c6-ae30-b39bc59ed216}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4668,7 +4062,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."cat_mat_roughness" sql=</datasource>
       <keywordList>
@@ -4685,7 +4079,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -4708,7 +4102,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4729,7 +4123,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -4787,42 +4181,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="matcat_id"/>
-        <alias index="2" name="" field="period_id"/>
-        <alias index="3" name="" field="init_age"/>
-        <alias index="4" name="" field="end_age"/>
-        <alias index="5" name="" field="roughness"/>
-        <alias index="6" name="" field="descript"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="matcat_id" name="" index="1"/>
+        <alias field="period_id" name="" index="2"/>
+        <alias field="init_age" name="" index="3"/>
+        <alias field="end_age" name="" index="4"/>
+        <alias field="roughness" name="" index="5"/>
+        <alias field="descript" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="period_id" applyOnUpdate="0"/>
-        <default expression="" field="init_age" applyOnUpdate="0"/>
-        <default expression="" field="end_age" applyOnUpdate="0"/>
-        <default expression="" field="roughness" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="period_id" expression=""/>
+        <default applyOnUpdate="0" field="init_age" expression=""/>
+        <default applyOnUpdate="0" field="end_age" expression=""/>
+        <default applyOnUpdate="0" field="roughness" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="period_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="init_age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="end_age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="roughness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="period_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="init_age" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="end_age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="roughness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="period_id"/>
-        <constraint desc="" exp="" field="init_age"/>
-        <constraint desc="" exp="" field="end_age"/>
-        <constraint desc="" exp="" field="roughness"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="period_id" desc=""/>
+        <constraint exp="" field="init_age" desc=""/>
+        <constraint exp="" field="end_age" desc=""/>
+        <constraint exp="" field="roughness" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -4849,7 +4243,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_node20151105202206790</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_node" sql=</datasource>
       <keywordList>
@@ -4898,11 +4292,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -4932,7 +4326,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4941,73 +4335,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="nodetype_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ADAPTATION" name="ADAPTATION"/>
-                  <Option type="QString" value="AIR_VALVE" name="AIR_VALVE"/>
-                  <Option type="QString" value="BYPASS_REGISTER" name="BYPASS_REGISTER"/>
-                  <Option type="QString" value="CHECK_VALVE" name="CHECK_VALVE"/>
-                  <Option type="QString" value="CLORINATHOR" name="CLORINATHOR"/>
-                  <Option type="QString" value="CONTROL_REGISTER" name="CONTROL_REGISTER"/>
-                  <Option type="QString" value="CURVE" name="CURVE"/>
-                  <Option type="QString" value="ENDLINE" name="ENDLINE"/>
-                  <Option type="QString" value="EXPANTANK" name="EXPANTANK"/>
-                  <Option type="QString" value="FILTER" name="FILTER"/>
-                  <Option type="QString" value="FLEXUNION" name="FLEXUNION"/>
-                  <Option type="QString" value="FLOWMETER" name="FLOWMETER"/>
-                  <Option type="QString" value="FL_CONTR_VALVE" name="FL_CONTR_VALVE"/>
-                  <Option type="QString" value="GEN_PURP_VALVE" name="GEN_PURP_VALVE"/>
-                  <Option type="QString" value="GREEN_VALVE" name="GREEN_VALVE"/>
-                  <Option type="QString" value="HYDRANT" name="HYDRANT"/>
-                  <Option type="QString" value="JUNCTION" name="JUNCTION"/>
-                  <Option type="QString" value="MANHOLE" name="MANHOLE"/>
-                  <Option type="QString" value="NETELEMENT" name="NETELEMENT"/>
-                  <Option type="QString" value="NETSAMPLEPOINT" name="NETSAMPLEPOINT"/>
-                  <Option type="QString" value="OUTFALL_VALVE" name="OUTFALL_VALVE"/>
-                  <Option type="QString" value="PRESSURE_METER" name="PRESSURE_METER"/>
-                  <Option type="QString" value="PR_BREAK_VALVE" name="PR_BREAK_VALVE"/>
-                  <Option type="QString" value="PR_REDUC_VALVE" name="PR_REDUC_VALVE"/>
-                  <Option type="QString" value="PR_SUSTA_VALVE" name="PR_SUSTA_VALVE"/>
-                  <Option type="QString" value="PUMP" name="PUMP"/>
-                  <Option type="QString" value="REDUCTION" name="REDUCTION"/>
-                  <Option type="QString" value="REGISTER" name="REGISTER"/>
-                  <Option type="QString" value="SHUTOFF_VALVE" name="SHUTOFF_VALVE"/>
-                  <Option type="QString" value="SOURCE" name="SOURCE"/>
-                  <Option type="QString" value="T" name="T"/>
-                  <Option type="QString" value="TANK" name="TANK"/>
-                  <Option type="QString" value="TAP" name="TAP"/>
-                  <Option type="QString" value="THROTTLE_VALVE" name="THROTTLE_VALVE"/>
-                  <Option type="QString" value="VALVE_REGISTER" name="VALVE_REGISTER"/>
-                  <Option type="QString" value="WATERWELL" name="WATERWELL"/>
-                  <Option type="QString" value="WATER_CONNECTION" name="WATER_CONNECTION"/>
-                  <Option type="QString" value="WTP" name="WTP"/>
-                  <Option type="QString" value="X" name="X"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CC" name="Concret"/>
-                  <Option type="QString" value="FC" name="Fiberconcret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="FD-FD-PVC" name="Iron-Iron-PVC"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5016,8 +4365,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5026,8 +4375,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5036,8 +4385,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5046,16 +4395,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="shape">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -5063,8 +4415,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5073,177 +4425,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="svg">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
-            </config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
           </editWidget>
         </field>
         <field name="estimated_depth">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_unit">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="kg" name="kg"/>
-                  <Option type="QString" value="m" name="m"/>
-                  <Option type="QString" value="m2" name="m2"/>
-                  <Option type="QString" value="m3" name="m3"/>
-                  <Option type="QString" value="pa" name="pa"/>
-                  <Option type="QString" value="t" name="t"/>
-                  <Option type="QString" value="u" name="u"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5252,8 +4495,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -5262,147 +4505,155 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ischange">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="nodetype_id" field="nodetype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="pnom" field="pnom"/>
-        <alias index="4" name="dnom" field="dnom"/>
-        <alias index="5" name="dint" field="dint"/>
-        <alias index="6" name="dext" field="dext"/>
-        <alias index="7" name="shape" field="shape"/>
-        <alias index="8" name="descript" field="descript"/>
-        <alias index="9" name="link" field="link"/>
-        <alias index="10" name="brand" field="brand"/>
-        <alias index="11" name="model" field="model"/>
-        <alias index="12" name="svg" field="svg"/>
-        <alias index="13" name="estimated_depth" field="estimated_depth"/>
-        <alias index="14" name="cost_unit" field="cost_unit"/>
-        <alias index="15" name="cost" field="cost"/>
-        <alias index="16" name="active" field="active"/>
-        <alias index="17" name="label" field="label"/>
-        <alias index="18" name="ischange" field="ischange"/>
-        <alias index="19" name="" field="acoeff"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="nodetype_id" name="nodetype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="pnom" name="pnom" index="3"/>
+        <alias field="dnom" name="dnom" index="4"/>
+        <alias field="dint" name="dint" index="5"/>
+        <alias field="dext" name="dext" index="6"/>
+        <alias field="shape" name="shape" index="7"/>
+        <alias field="descript" name="descript" index="8"/>
+        <alias field="link" name="link" index="9"/>
+        <alias field="brand" name="brand" index="10"/>
+        <alias field="model" name="model" index="11"/>
+        <alias field="svg" name="svg" index="12"/>
+        <alias field="estimated_depth" name="estimated_depth" index="13"/>
+        <alias field="cost_unit" name="cost_unit" index="14"/>
+        <alias field="cost" name="cost" index="15"/>
+        <alias field="active" name="active" index="16"/>
+        <alias field="label" name="label" index="17"/>
+        <alias field="ischange" name="ischange" index="18"/>
+        <alias field="acoeff" name="" index="19"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="pnom" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="dint" applyOnUpdate="0"/>
-        <default expression="" field="dext" applyOnUpdate="0"/>
-        <default expression="" field="shape" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="estimated_depth" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="ischange" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="pnom" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="dint" expression=""/>
+        <default applyOnUpdate="0" field="dext" expression=""/>
+        <default applyOnUpdate="0" field="shape" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="estimated_depth" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="ischange" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dint"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shape"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="estimated_depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ischange"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dint" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shape" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="estimated_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ischange" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="pnom"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="dint"/>
-        <constraint desc="" exp="" field="dext"/>
-        <constraint desc="" exp="" field="shape"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="estimated_depth"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="ischange"/>
-        <constraint desc="" exp="" field="acoeff"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="pnom" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="dint" desc=""/>
+        <constraint exp="" field="dext" desc=""/>
+        <constraint exp="" field="shape" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="estimated_depth" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="ischange" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5e532eda-2adf-49b1-810e-d1c3638f2389}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{9146de0d-51f8-4a54-95cf-0e97790df700}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="129"/>
-          <column type="field" hidden="0" name="nodetype_id" width="115"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="pnom" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="dint" width="-1"/>
-          <column type="field" hidden="0" name="dext" width="-1"/>
-          <column type="field" hidden="0" name="shape" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="104"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="115"/>
-          <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="156"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
+          <column type="field" width="129" hidden="0" name="id"/>
+          <column type="field" width="115" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="pnom"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="dint"/>
+          <column type="field" width="-1" hidden="0" name="dext"/>
+          <column type="field" width="-1" hidden="0" name="shape"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="104" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="115" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="156" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="ischange"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5434,6 +4685,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
         <field name="active" editable="1"/>
         <field name="brand" editable="1"/>
         <field name="cost" editable="1"/>
@@ -5455,6 +4707,7 @@ def my_form_open(dialog, layer, feature):
         <field name="svg" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
         <field labelOnTop="0" name="active"/>
         <field labelOnTop="0" name="brand"/>
         <field labelOnTop="0" name="cost"/>
@@ -5465,6 +4718,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="dnom"/>
         <field labelOnTop="0" name="estimated_depth"/>
         <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="ischange"/>
         <field labelOnTop="0" name="label"/>
         <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="matcat_id"/>
@@ -5478,7 +4732,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_owner20160224165938429</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_owner" sql=</datasource>
       <keywordList>
@@ -5518,7 +4772,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5539,7 +4793,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5555,8 +4809,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5570,42 +4824,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{338aec8f-1bd1-4d10-a1a4-128b5a49d09c}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{338aec8f-1bd1-4d10-a1a4-128b5a49d09c}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5630,7 +4884,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_pavement20170111155456255</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_pavement" sql=</datasource>
       <keywordList>
@@ -5657,6 +4911,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -5670,10 +4933,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -5690,8 +4961,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5700,8 +4975,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5710,8 +4985,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5720,8 +4995,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5730,159 +5005,65 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m2_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
-        <alias index="3" name="thickness" field="thickness"/>
-        <alias index="4" name="m2_cost" field="m2_cost"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
+        <alias field="thickness" name="thickness" index="3"/>
+        <alias field="m2_cost" name="m2_cost" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="thickness" applyOnUpdate="0"/>
-        <default expression="" field="m2_cost" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="thickness" expression=""/>
+        <default applyOnUpdate="0" field="m2_cost" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="thickness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2_cost"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="thickness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2_cost" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="thickness"/>
-        <constraint desc="" exp="" field="m2_cost"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="thickness" desc=""/>
+        <constraint exp="" field="m2_cost" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="thickness" width="-1"/>
-          <column type="field" hidden="0" name="m2_cost" width="121"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="thickness"/>
+          <column type="field" width="121" hidden="0" name="m2_cost"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5894,7 +5075,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -5904,12 +5101,18 @@ def my_form_open(dialog, layer, feature):
         <field name="m2_cost" editable="1"/>
         <field name="thickness" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="link"/>
+        <field labelOnTop="0" name="m2_cost"/>
+        <field labelOnTop="0" name="thickness"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_soil20151105202206837</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_soil" sql=</datasource>
       <keywordList>
@@ -5936,6 +5139,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -5949,10 +5161,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -5969,8 +5189,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5979,8 +5203,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5989,8 +5213,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5999,16 +5223,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_param">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6016,8 +5243,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6026,508 +5253,125 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3exc_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3fill_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3excess_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m2trenchl_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
-        <alias index="3" name="y_param" field="y_param"/>
-        <alias index="4" name="b" field="b"/>
-        <alias index="5" name="trenchlining" field="trenchlining"/>
-        <alias index="6" name="m3exc_cost" field="m3exc_cost"/>
-        <alias index="7" name="m3fill_cost" field="m3fill_cost"/>
-        <alias index="8" name="m3excess_cost" field="m3excess_cost"/>
-        <alias index="9" name="m2trenchl_cost" field="m2trenchl_cost"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
+        <alias field="y_param" name="y_param" index="3"/>
+        <alias field="b" name="b" index="4"/>
+        <alias field="trenchlining" name="trenchlining" index="5"/>
+        <alias field="m3exc_cost" name="m3exc_cost" index="6"/>
+        <alias field="m3fill_cost" name="m3fill_cost" index="7"/>
+        <alias field="m3excess_cost" name="m3excess_cost" index="8"/>
+        <alias field="m2trenchl_cost" name="m2trenchl_cost" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="y_param" applyOnUpdate="0"/>
-        <default expression="" field="b" applyOnUpdate="0"/>
-        <default expression="" field="trenchlining" applyOnUpdate="0"/>
-        <default expression="" field="m3exc_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3fill_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3excess_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2trenchl_cost" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="y_param" expression=""/>
+        <default applyOnUpdate="0" field="b" expression=""/>
+        <default applyOnUpdate="0" field="trenchlining" expression=""/>
+        <default applyOnUpdate="0" field="m3exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2trenchl_cost" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_param"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="b"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="trenchlining"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3exc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3fill_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3excess_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2trenchl_cost"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_param" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="b" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="trenchlining" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2trenchl_cost" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="y_param"/>
-        <constraint desc="" exp="" field="b"/>
-        <constraint desc="" exp="" field="trenchlining"/>
-        <constraint desc="" exp="" field="m3exc_cost"/>
-        <constraint desc="" exp="" field="m3fill_cost"/>
-        <constraint desc="" exp="" field="m3excess_cost"/>
-        <constraint desc="" exp="" field="m2trenchl_cost"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="y_param" desc=""/>
+        <constraint exp="" field="b" desc=""/>
+        <constraint exp="" field="trenchlining" desc=""/>
+        <constraint exp="" field="m3exc_cost" desc=""/>
+        <constraint exp="" field="m3fill_cost" desc=""/>
+        <constraint exp="" field="m3excess_cost" desc=""/>
+        <constraint exp="" field="m2trenchl_cost" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{eba1aa31-93aa-423b-aa40-3c018a5cd864}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{a675ab10-b45d-4a03-8a30-6a1f308af4e5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;m3fill_cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="194"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="y_param" width="-1"/>
-          <column type="field" hidden="0" name="b" width="-1"/>
-          <column type="field" hidden="0" name="trenchlining" width="-1"/>
-          <column type="field" hidden="0" name="m3exc_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3fill_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3excess_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2trenchl_cost" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="194" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="y_param"/>
+          <column type="field" width="-1" hidden="0" name="b"/>
+          <column type="field" width="-1" hidden="0" name="trenchlining"/>
+          <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6539,7 +5383,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -6554,12 +5414,23 @@ def my_form_open(dialog, layer, feature):
         <field name="trenchlining" editable="1"/>
         <field name="y_param" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="b"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="link"/>
+        <field labelOnTop="0" name="m2trenchl_cost"/>
+        <field labelOnTop="0" name="m3exc_cost"/>
+        <field labelOnTop="0" name="m3excess_cost"/>
+        <field labelOnTop="0" name="m3fill_cost"/>
+        <field labelOnTop="0" name="trenchlining"/>
+        <field labelOnTop="0" name="y_param"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_users20180131084332505</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_users" sql=</datasource>
       <keywordList>
@@ -6586,6 +5457,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -6599,10 +5479,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -6619,8 +5507,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6629,8 +5521,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6639,8 +5531,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6649,77 +5541,76 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sys_role">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="role_admin" name="role_admin"/>
-                  <Option type="QString" value="role_basic" name="role_basic"/>
-                  <Option type="QString" value="role_crm" name="role_crm"/>
-                  <Option type="QString" value="role_edit" name="role_edit"/>
-                  <Option type="QString" value="role_epa" name="role_epa"/>
-                  <Option type="QString" value="role_master" name="role_master"/>
-                  <Option type="QString" value="role_om" name="role_om"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="external">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="context" field="context"/>
-        <alias index="3" name="sys_role" field="sys_role"/>
-        <alias index="4" name="" field="active"/>
-        <alias index="5" name="" field="external"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="context" name="context" index="2"/>
+        <alias field="sys_role" name="sys_role" index="3"/>
+        <alias field="active" name="" index="4"/>
+        <alias field="external" name="" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="context" applyOnUpdate="0"/>
-        <default expression="" field="sys_role" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="external" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="context" expression=""/>
+        <default applyOnUpdate="0" field="sys_role" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="external" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="context"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_role"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="external"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="context" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_role" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="external" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="context"/>
-        <constraint desc="" exp="" field="sys_role"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="external"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="context" desc=""/>
+        <constraint exp="" field="sys_role" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="external" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -6727,10 +5618,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="context" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="context"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="sys_role"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="external"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6742,21 +5636,46 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="active" editable="1"/>
         <field name="context" editable="1"/>
+        <field name="external" editable="1"/>
         <field name="id" editable="1"/>
         <field name="name" editable="1"/>
         <field name="sys_role" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="active"/>
+        <field labelOnTop="0" name="context"/>
+        <field labelOnTop="0" name="external"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="sys_role"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_work20160216122620842</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_work" sql=</datasource>
       <keywordList>
@@ -6796,7 +5715,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -6821,7 +5740,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6865,8 +5784,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6880,61 +5799,61 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
-        <alias index="3" name="workid_key1" field="workid_key1"/>
-        <alias index="4" name="workid_key2" field="workid_key2"/>
-        <alias index="5" name="builtdate" field="builtdate"/>
-        <alias index="6" name="" field="workcost"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
+        <alias field="workid_key1" name="workid_key1" index="3"/>
+        <alias field="workid_key2" name="workid_key2" index="4"/>
+        <alias field="builtdate" name="builtdate" index="5"/>
+        <alias field="workcost" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="workid_key1" applyOnUpdate="0"/>
-        <default expression="" field="workid_key2" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="workcost" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="workid_key1" expression=""/>
+        <default applyOnUpdate="0" field="workid_key2" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="workcost" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workid_key1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workid_key2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcost"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workid_key1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workid_key2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcost" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="workid_key1"/>
-        <constraint desc="" exp="" field="workid_key2"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="workcost"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="workid_key1" desc=""/>
+        <constraint exp="" field="workid_key2" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="workcost" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{8d093ce0-a598-4927-b014-7191ad5cab8c}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{8d093ce0-a598-4927-b014-7191ad5cab8c}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="workid_key1" width="-1"/>
-          <column type="field" hidden="0" name="workid_key2" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="workid_key1"/>
+          <column type="field" width="-1" hidden="0" name="workid_key2"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6978,7 +5897,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>ext_cat_hydrometer20160703033754739</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ext_cat_hydrometer" sql=</datasource>
       <shortname>ext_cat_hydrometer</shortname>
@@ -7019,7 +5938,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -7040,7 +5959,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7070,8 +5989,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7148,70 +6067,70 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="hydrometer_type" field="hydrometer_type"/>
-        <alias index="2" name="madeby" field="madeby"/>
-        <alias index="3" name="class" field="class"/>
-        <alias index="4" name="ulmc" field="ulmc"/>
-        <alias index="5" name="voltman_flow" field="voltman_flow"/>
-        <alias index="6" name="multi_jet_flow" field="multi_jet_flow"/>
-        <alias index="7" name="dnom" field="dnom"/>
-        <alias index="8" name="link" field="link"/>
-        <alias index="9" name="url" field="url"/>
-        <alias index="10" name="picture" field="picture"/>
-        <alias index="11" name="svg" field="svg"/>
-        <alias index="12" name="code" field="code"/>
-        <alias index="13" name="observ" field="observ"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="hydrometer_type" name="hydrometer_type" index="1"/>
+        <alias field="madeby" name="madeby" index="2"/>
+        <alias field="class" name="class" index="3"/>
+        <alias field="ulmc" name="ulmc" index="4"/>
+        <alias field="voltman_flow" name="voltman_flow" index="5"/>
+        <alias field="multi_jet_flow" name="multi_jet_flow" index="6"/>
+        <alias field="dnom" name="dnom" index="7"/>
+        <alias field="link" name="link" index="8"/>
+        <alias field="url" name="url" index="9"/>
+        <alias field="picture" name="picture" index="10"/>
+        <alias field="svg" name="svg" index="11"/>
+        <alias field="code" name="code" index="12"/>
+        <alias field="observ" name="observ" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="hydrometer_type" applyOnUpdate="0"/>
-        <default expression="" field="madeby" applyOnUpdate="0"/>
-        <default expression="" field="class" applyOnUpdate="0"/>
-        <default expression="" field="ulmc" applyOnUpdate="0"/>
-        <default expression="" field="voltman_flow" applyOnUpdate="0"/>
-        <default expression="" field="multi_jet_flow" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="url" applyOnUpdate="0"/>
-        <default expression="" field="picture" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="hydrometer_type" expression=""/>
+        <default applyOnUpdate="0" field="madeby" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="ulmc" expression=""/>
+        <default applyOnUpdate="0" field="voltman_flow" expression=""/>
+        <default applyOnUpdate="0" field="multi_jet_flow" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="url" expression=""/>
+        <default applyOnUpdate="0" field="picture" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hydrometer_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="madeby"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="class"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ulmc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="voltman_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="multi_jet_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="url"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="picture"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hydrometer_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="madeby" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ulmc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="voltman_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="multi_jet_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="url" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="picture" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="hydrometer_type"/>
-        <constraint desc="" exp="" field="madeby"/>
-        <constraint desc="" exp="" field="class"/>
-        <constraint desc="" exp="" field="ulmc"/>
-        <constraint desc="" exp="" field="voltman_flow"/>
-        <constraint desc="" exp="" field="multi_jet_flow"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="url"/>
-        <constraint desc="" exp="" field="picture"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="observ"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="hydrometer_type" desc=""/>
+        <constraint exp="" field="madeby" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="ulmc" desc=""/>
+        <constraint exp="" field="voltman_flow" desc=""/>
+        <constraint exp="" field="multi_jet_flow" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="url" desc=""/>
+        <constraint exp="" field="picture" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -7219,21 +6138,21 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="hydrometer_type" width="-1"/>
-          <column type="field" hidden="0" name="madeby" width="-1"/>
-          <column type="field" hidden="0" name="class" width="-1"/>
-          <column type="field" hidden="0" name="ulmc" width="-1"/>
-          <column type="field" hidden="0" name="voltman_flow" width="-1"/>
-          <column type="field" hidden="0" name="multi_jet_flow" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="url" width="-1"/>
-          <column type="field" hidden="0" name="picture" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="hydrometer_type"/>
+          <column type="field" width="-1" hidden="0" name="madeby"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="ulmc"/>
+          <column type="field" width="-1" hidden="0" name="voltman_flow"/>
+          <column type="field" width="-1" hidden="0" name="multi_jet_flow"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="url"/>
+          <column type="field" width="-1" hidden="0" name="picture"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7269,7 +6188,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>ext_cat_period20160703033754677</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ext_cat_period" sql=</datasource>
       <shortname>ext_cat_period</shortname>
@@ -7297,6 +6216,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -7310,10 +6238,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -7330,8 +6266,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7340,16 +6280,22 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="start_date">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7357,8 +6303,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7367,8 +6313,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7377,8 +6323,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7387,97 +6333,102 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="period_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="3" name="fall"/>
-                  <Option type="QString" value="1" name="spring"/>
-                  <Option type="QString" value="2" name="summer"/>
-                  <Option type="QString" value="4" name="winter"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="period_year">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="period_name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="start_date" field="start_date"/>
-        <alias index="2" name="end_date" field="end_date"/>
-        <alias index="3" name="period_seconds" field="period_seconds"/>
-        <alias index="4" name="comment" field="comment"/>
-        <alias index="5" name="code" field="code"/>
-        <alias index="6" name="period_type" field="period_type"/>
-        <alias index="7" name="period_year" field="period_year"/>
-        <alias index="8" name="period_name" field="period_name"/>
-        <alias index="9" name="expl_id" field="expl_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="start_date" name="start_date" index="1"/>
+        <alias field="end_date" name="end_date" index="2"/>
+        <alias field="period_seconds" name="period_seconds" index="3"/>
+        <alias field="comment" name="comment" index="4"/>
+        <alias field="code" name="code" index="5"/>
+        <alias field="period_type" name="period_type" index="6"/>
+        <alias field="period_year" name="period_year" index="7"/>
+        <alias field="period_name" name="period_name" index="8"/>
+        <alias field="expl_id" name="expl_id" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="start_date" applyOnUpdate="0"/>
-        <default expression="" field="end_date" applyOnUpdate="0"/>
-        <default expression="" field="period_seconds" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="period_type" applyOnUpdate="0"/>
-        <default expression="" field="period_year" applyOnUpdate="0"/>
-        <default expression="" field="period_name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="start_date" expression=""/>
+        <default applyOnUpdate="0" field="end_date" expression=""/>
+        <default applyOnUpdate="0" field="period_seconds" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="period_type" expression=""/>
+        <default applyOnUpdate="0" field="period_year" expression=""/>
+        <default applyOnUpdate="0" field="period_name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="start_date"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end_date"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_seconds"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_year"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="start_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="end_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_seconds" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_year" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="start_date"/>
-        <constraint desc="" exp="" field="end_date"/>
-        <constraint desc="" exp="" field="period_seconds"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="period_type"/>
-        <constraint desc="" exp="" field="period_year"/>
-        <constraint desc="" exp="" field="period_name"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="start_date" desc=""/>
+        <constraint exp="" field="end_date" desc=""/>
+        <constraint exp="" field="period_seconds" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="period_type" desc=""/>
+        <constraint exp="" field="period_year" desc=""/>
+        <constraint exp="" field="period_name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -7485,17 +6436,17 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="start_date" width="-1"/>
-          <column type="field" hidden="0" name="end_date" width="-1"/>
-          <column type="field" hidden="0" name="period_seconds" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="period_type" width="-1"/>
-          <column type="field" hidden="0" name="period_year" width="-1"/>
-          <column type="field" hidden="0" name="period_name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="start_date"/>
+          <column type="field" width="-1" hidden="0" name="end_date"/>
+          <column type="field" width="-1" hidden="0" name="period_seconds"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="period_type"/>
+          <column type="field" width="-1" hidden="0" name="period_year"/>
+          <column type="field" width="-1" hidden="0" name="period_name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7507,7 +6458,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -7522,12 +6489,23 @@ def my_form_open(dialog, layer, feature):
         <field name="period_year" editable="1"/>
         <field name="start_date" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="end_date"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="period_name"/>
+        <field labelOnTop="0" name="period_seconds"/>
+        <field labelOnTop="0" name="period_type"/>
+        <field labelOnTop="0" name="period_year"/>
+        <field labelOnTop="0" name="start_date"/>
+      </labelOnTop>
       <widgets/>
-      <previewExpression></previewExpression>
+      <previewExpression>period_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7582,11 +6560,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7610,26 +6588,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7646,86 +6624,98 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="muni_id" field="muni_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="observ" field="observ"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="muni_id" name="muni_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="observ" name="observ" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -7733,11 +6723,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="183"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7784,7 +6774,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_controls_x_arc20180109103020152</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_controls_x_arc" sql=</datasource>
       <keywordList>
@@ -7824,7 +6814,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -7845,7 +6835,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7880,39 +6870,39 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="text" field="text"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="text" name="text" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7938,7 +6928,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_383cb6c0_4452_42b4_a17d_131cca921196</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve" sql=</datasource>
       <keywordList>
@@ -7955,7 +6945,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -7978,7 +6968,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -7999,7 +6989,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -8036,30 +7026,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="curve_type"/>
-        <alias index="2" name="" field="descript"/>
-        <alias index="3" name="" field="isdoublen2a"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="curve_type" name="" index="1"/>
+        <alias field="descript" name="" index="2"/>
+        <alias field="isdoublen2a" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="curve_type" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="isdoublen2a" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="isdoublen2a" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="curve_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="isdoublen2a"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isdoublen2a" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="curve_type"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="isdoublen2a"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="isdoublen2a" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8086,7 +7076,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve_value" sql=</datasource>
       <keywordList>
@@ -8103,7 +7093,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -8126,7 +7116,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8147,7 +7137,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -8184,30 +7174,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="curve_id"/>
-        <alias index="2" name="" field="x_value"/>
-        <alias index="3" name="" field="y_value"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="curve_id" name="" index="1"/>
+        <alias field="x_value" name="" index="2"/>
+        <alias field="y_value" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="x_value" applyOnUpdate="0"/>
-        <default expression="" field="y_value" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="x_value" expression=""/>
+        <default applyOnUpdate="0" field="y_value" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="x_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="y_value"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="x_value" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="y_value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="x_value"/>
-        <constraint desc="" exp="" field="y_value"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="x_value" desc=""/>
+        <constraint exp="" field="y_value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8234,7 +7224,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_emitter20130813215614777</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_emitter" sql=</datasource>
       <keywordList>
@@ -8274,7 +7264,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8295,7 +7285,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8311,44 +7301,44 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="coef" field="coef"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="coef" name="coef" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="coef" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="coef" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="coef"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="coef"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="coef" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="coef" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="coef"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8372,7 +7362,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_energy" sql=</datasource>
       <keywordList>
@@ -8389,7 +7379,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -8412,7 +7402,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8433,7 +7423,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -8456,22 +7446,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8479,9 +7469,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8505,7 +7495,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_mixing20130813215615038</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_mixing" sql=</datasource>
       <keywordList>
@@ -8532,6 +7522,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8545,10 +7544,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -8570,7 +7577,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8579,70 +7586,70 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="mix_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="2COMP" name="2COMP"/>
-                  <Option type="QString" value="FIFO" name="FIFO"/>
-                  <Option type="QString" value="LIFO" name="LIFO"/>
-                  <Option type="QString" value="MIXED" name="MIXED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="value">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="mix_type" field="mix_type"/>
-        <alias index="2" name="value" field="value"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="mix_type" name="mix_type" index="1"/>
+        <alias field="value" name="value" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="mix_type" applyOnUpdate="0"/>
-        <default expression="" field="value" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="mix_type" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="mix_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="value"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mix_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="mix_type"/>
-        <constraint desc="" exp="" field="value"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="mix_type" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{090a6f21-21c8-42f5-9ee2-ac605342a7fa}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{48abc25e-d3b4-487c-84ec-7ac39610627f}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="mix_type" width="-1"/>
-          <column type="field" hidden="0" name="value" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="mix_type"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8678,12 +7685,16 @@ def my_form_open(dialog, layer, feature):
         <field name="node_id" editable="1"/>
         <field name="value" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="mix_type"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="value"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern20130813215615249</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern" sql=</datasource>
       <keywordList>
@@ -8732,11 +7743,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -8765,7 +7776,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8774,8 +7785,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -8803,48 +7814,48 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="pattern_id" field="pattern_id"/>
-        <alias index="1" name="observ" field="observ"/>
-        <alias index="2" name="tscode" field="tscode"/>
-        <alias index="3" name="tsparameters" field="tsparameters"/>
+        <alias field="pattern_id" name="pattern_id" index="0"/>
+        <alias field="observ" name="observ" index="1"/>
+        <alias field="tscode" name="tscode" index="2"/>
+        <alias field="tsparameters" name="tsparameters" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="tscode" applyOnUpdate="0"/>
-        <default expression="" field="tsparameters" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="tscode" expression=""/>
+        <default applyOnUpdate="0" field="tsparameters" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tscode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tsparameters"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tscode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tsparameters" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="tscode"/>
-        <constraint desc="" exp="" field="tsparameters"/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="tscode" desc=""/>
+        <constraint exp="" field="tsparameters" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5e331a69-33a3-4cac-9657-c86880183ed4}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5e331a69-33a3-4cac-9657-c86880183ed4}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="pattern_type" width="-1"/>
-          <column type="field" hidden="0" name="tscode" width="-1"/>
-          <column type="field" hidden="0" name="tsparameters" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="pattern_type"/>
+          <column type="field" width="-1" hidden="0" name="tscode"/>
+          <column type="field" width="-1" hidden="0" name="tsparameters"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8893,7 +7904,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("pattern_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern_value20180109135221371</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern_value" sql=</datasource>
       <keywordList>
@@ -8920,6 +7931,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8933,10 +7953,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -8958,161 +7986,188 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_3">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_4">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_5">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_6">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_7">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_8">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_9">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_10">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_11">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_12">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_13">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_14">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_15">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_16">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_17">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_18">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -9120,94 +8175,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="pattern_id" field="pattern_id"/>
-        <alias index="2" name="factor_1" field="factor_1"/>
-        <alias index="3" name="factor_2" field="factor_2"/>
-        <alias index="4" name="factor_3" field="factor_3"/>
-        <alias index="5" name="factor_4" field="factor_4"/>
-        <alias index="6" name="factor_5" field="factor_5"/>
-        <alias index="7" name="factor_6" field="factor_6"/>
-        <alias index="8" name="factor_7" field="factor_7"/>
-        <alias index="9" name="factor_8" field="factor_8"/>
-        <alias index="10" name="factor_9" field="factor_9"/>
-        <alias index="11" name="factor_10" field="factor_10"/>
-        <alias index="12" name="factor_11" field="factor_11"/>
-        <alias index="13" name="factor_12" field="factor_12"/>
-        <alias index="14" name="factor_13" field="factor_13"/>
-        <alias index="15" name="factor_14" field="factor_14"/>
-        <alias index="16" name="factor_15" field="factor_15"/>
-        <alias index="17" name="factor_16" field="factor_16"/>
-        <alias index="18" name="factor_17" field="factor_17"/>
-        <alias index="19" name="factor_18" field="factor_18"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="pattern_id" name="pattern_id" index="1"/>
+        <alias field="factor_1" name="factor_1" index="2"/>
+        <alias field="factor_2" name="factor_2" index="3"/>
+        <alias field="factor_3" name="factor_3" index="4"/>
+        <alias field="factor_4" name="factor_4" index="5"/>
+        <alias field="factor_5" name="factor_5" index="6"/>
+        <alias field="factor_6" name="factor_6" index="7"/>
+        <alias field="factor_7" name="factor_7" index="8"/>
+        <alias field="factor_8" name="factor_8" index="9"/>
+        <alias field="factor_9" name="factor_9" index="10"/>
+        <alias field="factor_10" name="factor_10" index="11"/>
+        <alias field="factor_11" name="factor_11" index="12"/>
+        <alias field="factor_12" name="factor_12" index="13"/>
+        <alias field="factor_13" name="factor_13" index="14"/>
+        <alias field="factor_14" name="factor_14" index="15"/>
+        <alias field="factor_15" name="factor_15" index="16"/>
+        <alias field="factor_16" name="factor_16" index="17"/>
+        <alias field="factor_17" name="factor_17" index="18"/>
+        <alias field="factor_18" name="factor_18" index="19"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="factor_1" applyOnUpdate="0"/>
-        <default expression="" field="factor_2" applyOnUpdate="0"/>
-        <default expression="" field="factor_3" applyOnUpdate="0"/>
-        <default expression="" field="factor_4" applyOnUpdate="0"/>
-        <default expression="" field="factor_5" applyOnUpdate="0"/>
-        <default expression="" field="factor_6" applyOnUpdate="0"/>
-        <default expression="" field="factor_7" applyOnUpdate="0"/>
-        <default expression="" field="factor_8" applyOnUpdate="0"/>
-        <default expression="" field="factor_9" applyOnUpdate="0"/>
-        <default expression="" field="factor_10" applyOnUpdate="0"/>
-        <default expression="" field="factor_11" applyOnUpdate="0"/>
-        <default expression="" field="factor_12" applyOnUpdate="0"/>
-        <default expression="" field="factor_13" applyOnUpdate="0"/>
-        <default expression="" field="factor_14" applyOnUpdate="0"/>
-        <default expression="" field="factor_15" applyOnUpdate="0"/>
-        <default expression="" field="factor_16" applyOnUpdate="0"/>
-        <default expression="" field="factor_17" applyOnUpdate="0"/>
-        <default expression="" field="factor_18" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="factor_1" expression=""/>
+        <default applyOnUpdate="0" field="factor_2" expression=""/>
+        <default applyOnUpdate="0" field="factor_3" expression=""/>
+        <default applyOnUpdate="0" field="factor_4" expression=""/>
+        <default applyOnUpdate="0" field="factor_5" expression=""/>
+        <default applyOnUpdate="0" field="factor_6" expression=""/>
+        <default applyOnUpdate="0" field="factor_7" expression=""/>
+        <default applyOnUpdate="0" field="factor_8" expression=""/>
+        <default applyOnUpdate="0" field="factor_9" expression=""/>
+        <default applyOnUpdate="0" field="factor_10" expression=""/>
+        <default applyOnUpdate="0" field="factor_11" expression=""/>
+        <default applyOnUpdate="0" field="factor_12" expression=""/>
+        <default applyOnUpdate="0" field="factor_13" expression=""/>
+        <default applyOnUpdate="0" field="factor_14" expression=""/>
+        <default applyOnUpdate="0" field="factor_15" expression=""/>
+        <default applyOnUpdate="0" field="factor_16" expression=""/>
+        <default applyOnUpdate="0" field="factor_17" expression=""/>
+        <default applyOnUpdate="0" field="factor_18" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_3"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_4"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_5"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_6"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_7"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_8"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_9"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_10"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_11"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_12"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_13"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_14"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_15"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_16"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_17"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_18"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_3" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_4" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_5" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_6" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_7" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_8" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_9" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_10" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_11" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_12" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_13" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_14" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_15" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_16" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_17" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_18" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="factor_1"/>
-        <constraint desc="" exp="" field="factor_2"/>
-        <constraint desc="" exp="" field="factor_3"/>
-        <constraint desc="" exp="" field="factor_4"/>
-        <constraint desc="" exp="" field="factor_5"/>
-        <constraint desc="" exp="" field="factor_6"/>
-        <constraint desc="" exp="" field="factor_7"/>
-        <constraint desc="" exp="" field="factor_8"/>
-        <constraint desc="" exp="" field="factor_9"/>
-        <constraint desc="" exp="" field="factor_10"/>
-        <constraint desc="" exp="" field="factor_11"/>
-        <constraint desc="" exp="" field="factor_12"/>
-        <constraint desc="" exp="" field="factor_13"/>
-        <constraint desc="" exp="" field="factor_14"/>
-        <constraint desc="" exp="" field="factor_15"/>
-        <constraint desc="" exp="" field="factor_16"/>
-        <constraint desc="" exp="" field="factor_17"/>
-        <constraint desc="" exp="" field="factor_18"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="factor_1" desc=""/>
+        <constraint exp="" field="factor_2" desc=""/>
+        <constraint exp="" field="factor_3" desc=""/>
+        <constraint exp="" field="factor_4" desc=""/>
+        <constraint exp="" field="factor_5" desc=""/>
+        <constraint exp="" field="factor_6" desc=""/>
+        <constraint exp="" field="factor_7" desc=""/>
+        <constraint exp="" field="factor_8" desc=""/>
+        <constraint exp="" field="factor_9" desc=""/>
+        <constraint exp="" field="factor_10" desc=""/>
+        <constraint exp="" field="factor_11" desc=""/>
+        <constraint exp="" field="factor_12" desc=""/>
+        <constraint exp="" field="factor_13" desc=""/>
+        <constraint exp="" field="factor_14" desc=""/>
+        <constraint exp="" field="factor_15" desc=""/>
+        <constraint exp="" field="factor_16" desc=""/>
+        <constraint exp="" field="factor_17" desc=""/>
+        <constraint exp="" field="factor_18" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -9215,33 +8270,27 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="factor_1" width="-1"/>
-          <column type="field" hidden="0" name="factor_2" width="-1"/>
-          <column type="field" hidden="0" name="factor_3" width="-1"/>
-          <column type="field" hidden="0" name="factor_4" width="-1"/>
-          <column type="field" hidden="0" name="factor_5" width="-1"/>
-          <column type="field" hidden="0" name="factor_6" width="-1"/>
-          <column type="field" hidden="0" name="factor_7" width="-1"/>
-          <column type="field" hidden="0" name="factor_8" width="-1"/>
-          <column type="field" hidden="0" name="factor_9" width="-1"/>
-          <column type="field" hidden="0" name="factor_10" width="-1"/>
-          <column type="field" hidden="0" name="factor_11" width="-1"/>
-          <column type="field" hidden="0" name="factor_12" width="-1"/>
-          <column type="field" hidden="0" name="factor_13" width="-1"/>
-          <column type="field" hidden="0" name="factor_14" width="-1"/>
-          <column type="field" hidden="0" name="factor_15" width="-1"/>
-          <column type="field" hidden="0" name="factor_16" width="-1"/>
-          <column type="field" hidden="0" name="factor_17" width="-1"/>
-          <column type="field" hidden="0" name="factor_18" width="-1"/>
-          <column type="field" hidden="0" name="factor_19" width="-1"/>
-          <column type="field" hidden="0" name="factor_20" width="-1"/>
-          <column type="field" hidden="0" name="factor_21" width="-1"/>
-          <column type="field" hidden="0" name="factor_22" width="-1"/>
-          <column type="field" hidden="0" name="factor_23" width="-1"/>
-          <column type="field" hidden="0" name="factor_24" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="factor_1"/>
+          <column type="field" width="-1" hidden="0" name="factor_2"/>
+          <column type="field" width="-1" hidden="0" name="factor_3"/>
+          <column type="field" width="-1" hidden="0" name="factor_4"/>
+          <column type="field" width="-1" hidden="0" name="factor_5"/>
+          <column type="field" width="-1" hidden="0" name="factor_6"/>
+          <column type="field" width="-1" hidden="0" name="factor_7"/>
+          <column type="field" width="-1" hidden="0" name="factor_8"/>
+          <column type="field" width="-1" hidden="0" name="factor_9"/>
+          <column type="field" width="-1" hidden="0" name="factor_10"/>
+          <column type="field" width="-1" hidden="0" name="factor_11"/>
+          <column type="field" width="-1" hidden="0" name="factor_12"/>
+          <column type="field" width="-1" hidden="0" name="factor_13"/>
+          <column type="field" width="-1" hidden="0" name="factor_14"/>
+          <column type="field" width="-1" hidden="0" name="factor_15"/>
+          <column type="field" width="-1" hidden="0" name="factor_16"/>
+          <column type="field" width="-1" hidden="0" name="factor_17"/>
+          <column type="field" width="-1" hidden="0" name="factor_18"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9294,12 +8343,33 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
         <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="factor_1"/>
+        <field labelOnTop="0" name="factor_10"/>
+        <field labelOnTop="0" name="factor_11"/>
+        <field labelOnTop="0" name="factor_12"/>
+        <field labelOnTop="0" name="factor_13"/>
+        <field labelOnTop="0" name="factor_14"/>
+        <field labelOnTop="0" name="factor_15"/>
+        <field labelOnTop="0" name="factor_16"/>
+        <field labelOnTop="0" name="factor_17"/>
+        <field labelOnTop="0" name="factor_18"/>
+        <field labelOnTop="0" name="factor_2"/>
+        <field labelOnTop="0" name="factor_3"/>
+        <field labelOnTop="0" name="factor_4"/>
+        <field labelOnTop="0" name="factor_5"/>
+        <field labelOnTop="0" name="factor_6"/>
+        <field labelOnTop="0" name="factor_7"/>
+        <field labelOnTop="0" name="factor_8"/>
+        <field labelOnTop="0" name="factor_9"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pump_additional20171218122636750</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pump_additional" sql=</datasource>
       <keywordList>
@@ -9326,6 +8396,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -9339,10 +8418,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -9364,7 +8451,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9373,8 +8460,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9383,8 +8470,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9393,8 +8480,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9403,21 +8490,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="curve_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="PUMP_01" name="PUMP_01"/>
-                  <Option type="QString" value="PUMP_02" name="PUMP_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9426,56 +8510,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CLOSED" name="CLOSED"/>
-                  <Option type="QString" value="OPEN" name="OPEN"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="energyparam">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="EFFIC" name="EFFIC"/>
-                  <Option type="QString" value="PATTERN" name="PATTERN"/>
-                  <Option type="QString" value="PRICE" name="PRICE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9484,76 +8550,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="order_id" field="order_id"/>
-        <alias index="3" name="power" field="power"/>
-        <alias index="4" name=" curve id" field="curve_id"/>
-        <alias index="5" name="speed" field="speed"/>
-        <alias index="6" name="pattern" field="pattern"/>
-        <alias index="7" name="status" field="status"/>
-        <alias index="8" name="energyparam" field="energyparam"/>
-        <alias index="9" name="energyvalue" field="energyvalue"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="order_id" name="order_id" index="2"/>
+        <alias field="power" name="power" index="3"/>
+        <alias field="curve_id" name=" curve id" index="4"/>
+        <alias field="speed" name="speed" index="5"/>
+        <alias field="pattern" name="pattern" index="6"/>
+        <alias field="status" name="status" index="7"/>
+        <alias field="energyparam" name="energyparam" index="8"/>
+        <alias field="energyvalue" name="energyvalue" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="order_id" applyOnUpdate="0"/>
-        <default expression="" field="power" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="speed" applyOnUpdate="0"/>
-        <default expression="" field="pattern" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="energyparam" applyOnUpdate="0"/>
-        <default expression="" field="energyvalue" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="order_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="energyparam" expression=""/>
+        <default applyOnUpdate="0" field="energyvalue" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="order_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="power"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="speed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="energyparam"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="energyvalue"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="order_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyparam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyvalue" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="order_id"/>
-        <constraint desc="" exp="" field="power"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="speed"/>
-        <constraint desc="" exp="" field="pattern"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="energyparam"/>
-        <constraint desc="" exp="" field="energyvalue"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="order_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="energyparam" desc=""/>
+        <constraint exp="" field="energyvalue" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="order_id" width="-1"/>
-          <column type="field" hidden="0" name="power" width="-1"/>
-          <column type="field" hidden="0" name="curve_id" width="-1"/>
-          <column type="field" hidden="0" name="speed" width="-1"/>
-          <column type="field" hidden="0" name="pattern" width="-1"/>
-          <column type="field" hidden="0" name="status" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="order_id"/>
+          <column type="field" width="-1" hidden="0" name="power"/>
+          <column type="field" width="-1" hidden="0" name="curve_id"/>
+          <column type="field" width="-1" hidden="0" name="speed"/>
+          <column type="field" width="-1" hidden="0" name="pattern"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="energyparam"/>
+          <column type="field" width="-1" hidden="0" name="energyvalue"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9596,12 +8666,23 @@ def my_form_open(dialog, layer, feature):
         <field name="speed" editable="1"/>
         <field name="status" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="curve_id"/>
+        <field labelOnTop="0" name="energyparam"/>
+        <field labelOnTop="0" name="energyvalue"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="order_id"/>
+        <field labelOnTop="0" name="pattern"/>
+        <field labelOnTop="0" name="power"/>
+        <field labelOnTop="0" name="speed"/>
+        <field labelOnTop="0" name="status"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_quality20130813215615383</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_quality" sql=</datasource>
       <keywordList>
@@ -9641,7 +8722,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -9666,7 +8747,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9682,44 +8763,44 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="initqual" field="initqual"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="initqual" name="initqual" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="initqual" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="initqual" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="initqual"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initqual" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="initqual"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="initqual" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="initqual" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="initqual"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9759,7 +8840,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_reactions_f73d50b8_9677_4153_a539_44288088218b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_reactions" sql=</datasource>
       <keywordList>
@@ -9776,7 +8857,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -9799,7 +8880,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -9820,7 +8901,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -9843,22 +8924,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -9866,9 +8947,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9892,7 +8973,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_arc20180109103020214</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_arc" sql=</datasource>
       <keywordList>
@@ -9932,7 +9013,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -9953,7 +9034,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9962,8 +9043,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9972,8 +9053,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9982,7 +9063,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -9996,39 +9077,39 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="text" field="text"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="text" name="text" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10054,7 +9135,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_node20180109103020245</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_node" sql=</datasource>
       <keywordList>
@@ -10094,7 +9175,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10119,7 +9200,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10128,8 +9209,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10138,8 +9219,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10148,7 +9229,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -10162,39 +9243,39 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="text" field="text"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="text" name="text" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="140"/>
-          <column type="field" hidden="0" name="text" width="257"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="140" hidden="0" name="node_id"/>
+          <column type="field" width="257" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10236,7 +9317,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="-4.65661e-10" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="-4.65661e-10" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_source20130813215615594</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_source" sql=</datasource>
       <keywordList>
@@ -10263,6 +9344,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10276,10 +9366,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -10297,10 +9395,11 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="variableNames" value="_fields_"/>
-        <property key="variableValues" value=""/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10309,22 +9408,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sourc_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CONCEN" name="CONCEN"/>
-                  <Option type="QString" value="FLOWPACED" name="FLOWPACED"/>
-                  <Option type="QString" value="MASS" name="MASS"/>
-                  <Option type="QString" value="SETPOINT" name="SETPOINT"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10333,77 +9428,65 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="sourc_type" field="sourc_type"/>
-        <alias index="2" name="quality" field="quality"/>
-        <alias index="3" name="pattern_id" field="pattern_id"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="sourc_type" name="sourc_type" index="1"/>
+        <alias field="quality" name="quality" index="2"/>
+        <alias field="pattern_id" name="pattern_id" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="sourc_type" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="sourc_type" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sourc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sourc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="sourc_type"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="sourc_type" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5bf224c0-cbdb-424f-bf89-7261c1778097}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{e54b4ee0-6770-4558-9c37-87e9e290f252}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="sourc_type" width="-1"/>
-          <column type="field" hidden="0" name="quality" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="sourc_type"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10440,12 +9523,17 @@ def my_form_open(dialog, layer, feature):
         <field name="quality" editable="1"/>
         <field name="sourc_type" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+        <field labelOnTop="0" name="quality"/>
+        <field labelOnTop="0" name="sourc_type"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>macroexploitation20171207121804523</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macroexpl_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."macroexploitation" sql=</datasource>
       <keywordList>
@@ -10472,6 +9560,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10485,10 +9582,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -10505,23 +9610,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macroexpl_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10529,45 +9644,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macroexpl_id" field="macroexpl_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="undelete" field="undelete"/>
+        <alias field="macroexpl_id" name="macroexpl_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="undelete" name="undelete" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -10575,11 +9693,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10591,7 +9709,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -10600,12 +9734,17 @@ def my_form_open(dialog, layer, feature):
         <field name="name" editable="1"/>
         <field name="undelete" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="macroexpl_id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="undelete"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("macroexp_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_arc_x_pavement20160710012151609</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."plan_arc_x_pavement" sql=</datasource>
       <shortname>plan_arc_x_pavement</shortname>
@@ -10633,6 +9772,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10646,10 +9794,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -10666,8 +9822,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10676,8 +9836,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10686,21 +9846,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pavcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="Asphalt" name="Asphalt"/>
-                  <Option type="QString" value="pavement1" name="pavement1"/>
-                  <Option type="QString" value="pavement2" name="pavement2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10709,38 +9866,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="pavcat_id" field="pavcat_id"/>
-        <alias index="3" name="percent" field="percent"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="pavcat_id" name="pavcat_id" index="2"/>
+        <alias field="percent" name="percent" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="pavcat_id" applyOnUpdate="0"/>
-        <default expression="" field="percent" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="pavcat_id" expression=""/>
+        <default applyOnUpdate="0" field="percent" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pavcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="percent"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pavcat_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="percent" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="pavcat_id"/>
-        <constraint desc="" exp="" field="percent"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="pavcat_id" desc=""/>
+        <constraint exp="" field="percent" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -10748,11 +9905,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="pavcat_id" width="-1"/>
-          <column type="field" hidden="0" name="percent" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="pavcat_id"/>
+          <column type="field" width="-1" hidden="0" name="percent"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10764,7 +9921,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -10773,12 +9946,17 @@ def my_form_open(dialog, layer, feature):
         <field name="pavcat_id" editable="1"/>
         <field name="percent" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="arc_id"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pavcat_id"/>
+        <field labelOnTop="0" name="percent"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price_compost" sql=</datasource>
       <keywordList>
@@ -10795,7 +9973,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -10818,7 +9996,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10841,7 +10019,7 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -10878,30 +10056,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="compost_id"/>
-        <alias index="2" name="" field="simple_id"/>
-        <alias index="3" name="" field="value"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="compost_id" name="" index="1"/>
+        <alias field="simple_id" name="" index="2"/>
+        <alias field="value" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="compost_id" applyOnUpdate="0"/>
-        <default expression="" field="simple_id" applyOnUpdate="0"/>
-        <default expression="" field="value" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="compost_id" expression=""/>
+        <default applyOnUpdate="0" field="simple_id" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="compost_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="simple_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="value"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="compost_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="simple_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="compost_id"/>
-        <constraint desc="" exp="" field="simple_id"/>
-        <constraint desc="" exp="" field="value"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="compost_id" desc=""/>
+        <constraint exp="" field="simple_id" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -10909,11 +10087,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="compost_id" width="-1"/>
-          <column type="field" hidden="0" name="simple_id" width="-1"/>
-          <column type="field" hidden="0" name="value" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="compost_id"/>
+          <column type="field" width="-1" hidden="0" name="simple_id"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10934,7 +10112,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price" sql=</datasource>
       <keywordList>
@@ -10951,7 +10129,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -10974,7 +10152,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10997,7 +10175,7 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property key="dualview/previewExpressions" value="&quot;descript&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -11048,38 +10226,38 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="unit"/>
-        <alias index="2" name="" field="descript"/>
-        <alias index="3" name="" field="text"/>
-        <alias index="4" name="" field="price"/>
-        <alias index="5" name="" field="pricecat_id"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="unit" name="" index="1"/>
+        <alias field="descript" name="" index="2"/>
+        <alias field="text" name="" index="3"/>
+        <alias field="price" name="" index="4"/>
+        <alias field="pricecat_id" name="" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="unit" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="price" applyOnUpdate="0"/>
-        <default expression="" field="pricecat_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="unit" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="price" expression=""/>
+        <default applyOnUpdate="0" field="pricecat_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="price"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pricecat_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="unit" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="price" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pricecat_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="unit"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="price"/>
-        <constraint desc="" exp="" field="pricecat_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="unit" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="price" desc=""/>
+        <constraint exp="" field="pricecat_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -11087,13 +10265,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="unit" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="field" hidden="0" name="price" width="-1"/>
-          <column type="field" hidden="0" name="pricecat_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="unit"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="price"/>
+          <column type="field" width="-1" hidden="0" name="pricecat_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11114,7 +10292,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"descript"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11173,7 +10351,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -11197,118 +10375,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" symbol="0" label="Obsolete" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0"/>
-          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" symbol="1" label="On service" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1"/>
-          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" symbol="2" label="Planified" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2"/>
-          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" symbol="3" label="Varc" filter=" &quot;sys_type&quot; = 'VARC' "/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11317,79 +10495,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="arccat_id" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="LineGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="0" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -11402,22 +10580,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11991,338 +11169,338 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="node_1"/>
-        <alias index="3" name="" field="node_2"/>
-        <alias index="4" name="" field="elevation1"/>
-        <alias index="5" name="" field="depth1"/>
-        <alias index="6" name="" field="elevation2"/>
-        <alias index="7" name="" field="depth2"/>
-        <alias index="8" name="" field="arccat_id"/>
-        <alias index="9" name="" field="arc_type"/>
-        <alias index="10" name="" field="sys_type"/>
-        <alias index="11" name="" field="cat_matcat_id"/>
-        <alias index="12" name="" field="cat_pnom"/>
-        <alias index="13" name="" field="cat_dnom"/>
-        <alias index="14" name="" field="epa_type"/>
-        <alias index="15" name="" field="expl_id"/>
-        <alias index="16" name="" field="macroexpl_id"/>
-        <alias index="17" name="" field="sector_id"/>
-        <alias index="18" name="" field="sector_name"/>
-        <alias index="19" name="" field="macrosector_id"/>
-        <alias index="20" name="" field="state"/>
-        <alias index="21" name="" field="state_type"/>
-        <alias index="22" name="" field="annotation"/>
-        <alias index="23" name="" field="observ"/>
-        <alias index="24" name="" field="comment"/>
-        <alias index="25" name="" field="gis_length"/>
-        <alias index="26" name="" field="custom_length"/>
-        <alias index="27" name="" field="minsector_id"/>
-        <alias index="28" name="" field="dma_id"/>
-        <alias index="29" name="" field="dma_name"/>
-        <alias index="30" name="" field="macrodma_id"/>
-        <alias index="31" name="" field="presszone_id"/>
-        <alias index="32" name="" field="presszone_name"/>
-        <alias index="33" name="" field="dqa_id"/>
-        <alias index="34" name="" field="dqa_name"/>
-        <alias index="35" name="" field="macrodqa_id"/>
-        <alias index="36" name="" field="soilcat_id"/>
-        <alias index="37" name="" field="function_type"/>
-        <alias index="38" name="" field="category_type"/>
-        <alias index="39" name="" field="fluid_type"/>
-        <alias index="40" name="" field="location_type"/>
-        <alias index="41" name="" field="workcat_id"/>
-        <alias index="42" name="" field="workcat_id_end"/>
-        <alias index="43" name="" field="buildercat_id"/>
-        <alias index="44" name="" field="builtdate"/>
-        <alias index="45" name="" field="enddate"/>
-        <alias index="46" name="" field="ownercat_id"/>
-        <alias index="47" name="" field="muni_id"/>
-        <alias index="48" name="" field="postcode"/>
-        <alias index="49" name="" field="district_id"/>
-        <alias index="50" name="" field="streetname"/>
-        <alias index="51" name="" field="postnumber"/>
-        <alias index="52" name="" field="postcomplement"/>
-        <alias index="53" name="" field="streetname2"/>
-        <alias index="54" name="" field="postnumber2"/>
-        <alias index="55" name="" field="postcomplement2"/>
-        <alias index="56" name="" field="descript"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="cat_arctype_id"/>
-        <alias index="68" name="" field="nodetype_1"/>
-        <alias index="69" name="" field="staticpress1"/>
-        <alias index="70" name="" field="nodetype_2"/>
-        <alias index="71" name="" field="staticpress2"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="depth"/>
-        <alias index="77" name="" field="adate"/>
-        <alias index="78" name="" field="adescript"/>
-        <alias index="79" name="" field="dma_style"/>
-        <alias index="80" name="" field="presszone_style"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="node_1" name="" index="2"/>
+        <alias field="node_2" name="" index="3"/>
+        <alias field="elevation1" name="" index="4"/>
+        <alias field="depth1" name="" index="5"/>
+        <alias field="elevation2" name="" index="6"/>
+        <alias field="depth2" name="" index="7"/>
+        <alias field="arccat_id" name="" index="8"/>
+        <alias field="arc_type" name="" index="9"/>
+        <alias field="sys_type" name="" index="10"/>
+        <alias field="cat_matcat_id" name="" index="11"/>
+        <alias field="cat_pnom" name="" index="12"/>
+        <alias field="cat_dnom" name="" index="13"/>
+        <alias field="epa_type" name="" index="14"/>
+        <alias field="expl_id" name="" index="15"/>
+        <alias field="macroexpl_id" name="" index="16"/>
+        <alias field="sector_id" name="" index="17"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="elevation1" applyOnUpdate="0"/>
-        <default expression="" field="depth1" applyOnUpdate="0"/>
-        <default expression="" field="elevation2" applyOnUpdate="0"/>
-        <default expression="" field="depth2" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="gis_length" applyOnUpdate="0"/>
-        <default expression="" field="custom_length" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="cat_arctype_id" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_1" applyOnUpdate="0"/>
-        <default expression="" field="staticpress1" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_2" applyOnUpdate="0"/>
-        <default expression="" field="staticpress2" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gis_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_arctype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="elevation1"/>
-        <constraint desc="" exp="" field="depth1"/>
-        <constraint desc="" exp="" field="elevation2"/>
-        <constraint desc="" exp="" field="depth2"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="gis_length"/>
-        <constraint desc="" exp="" field="custom_length"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="cat_arctype_id"/>
-        <constraint desc="" exp="" field="nodetype_1"/>
-        <constraint desc="" exp="" field="staticpress1"/>
-        <constraint desc="" exp="" field="nodetype_2"/>
-        <constraint desc="" exp="" field="staticpress2"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -12330,79 +11508,79 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="node_1" width="-1"/>
-          <column type="field" hidden="0" name="node_2" width="-1"/>
-          <column type="field" hidden="0" name="elevation1" width="-1"/>
-          <column type="field" hidden="0" name="depth1" width="-1"/>
-          <column type="field" hidden="0" name="elevation2" width="-1"/>
-          <column type="field" hidden="0" name="depth2" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="gis_length" width="-1"/>
-          <column type="field" hidden="0" name="custom_length" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="cat_arctype_id" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_1" width="-1"/>
-          <column type="field" hidden="0" name="staticpress1" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_2" width="-1"/>
-          <column type="field" hidden="0" name="staticpress2" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12587,7 +11765,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxcircle20180403155702431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxcircle" (geom_polygon) sql=</datasource>
       <keywordList>
@@ -12627,7 +11805,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -12647,26 +11825,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="115,189,167,0"/>
-              <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="227,26,28,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="115,189,167,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="227,26,28,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12683,22 +11861,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12707,33 +11885,33 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
+        <alias field="id" name="id" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12772,7 +11950,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxpoint20180403155702690</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxpoint" (geom_point) sql=</datasource>
       <keywordList>
@@ -12812,7 +11990,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -12832,33 +12010,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12875,22 +12053,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12899,33 +12077,33 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
+        <alias field="id" name="id" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12964,7 +12142,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13023,7 +12201,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13047,179 +12225,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" symbol="0" label="Greentap" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500"/>
-          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" symbol="1" label="Wjoin" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500"/>
-          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" symbol="2" label="Tap" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500"/>
-          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" symbol="3" label="Fountain" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13234,22 +12412,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13809,330 +12987,330 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="connec_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="connecat_id"/>
-        <alias index="7" name="" field="expl_id"/>
-        <alias index="8" name="" field="macroexpl_id"/>
-        <alias index="9" name="" field="sector_id"/>
-        <alias index="10" name="" field="sector_name"/>
-        <alias index="11" name="" field="macrosector_id"/>
-        <alias index="12" name="" field="customer_code"/>
-        <alias index="13" name="" field="cat_matcat_id"/>
-        <alias index="14" name="" field="cat_pnom"/>
-        <alias index="15" name="" field="cat_dnom"/>
-        <alias index="16" name="" field="connec_length"/>
-        <alias index="17" name="" field="state"/>
-        <alias index="18" name="" field="state_type"/>
-        <alias index="19" name="" field="n_hydrometer"/>
-        <alias index="20" name="" field="arc_id"/>
-        <alias index="21" name="" field="annotation"/>
-        <alias index="22" name="" field="observ"/>
-        <alias index="23" name="" field="comment"/>
-        <alias index="24" name="" field="minsector_id"/>
-        <alias index="25" name="" field="dma_id"/>
-        <alias index="26" name="" field="dma_name"/>
-        <alias index="27" name="" field="macrodma_id"/>
-        <alias index="28" name="" field="presszone_id"/>
-        <alias index="29" name="" field="presszone_name"/>
-        <alias index="30" name="" field="staticpressure"/>
-        <alias index="31" name="" field="dqa_id"/>
-        <alias index="32" name="" field="dqa_name"/>
-        <alias index="33" name="" field="macrodqa_id"/>
-        <alias index="34" name="" field="soilcat_id"/>
-        <alias index="35" name="" field="function_type"/>
-        <alias index="36" name="" field="category_type"/>
-        <alias index="37" name="" field="fluid_type"/>
-        <alias index="38" name="" field="location_type"/>
-        <alias index="39" name="" field="workcat_id"/>
-        <alias index="40" name="" field="workcat_id_end"/>
-        <alias index="41" name="" field="buildercat_id"/>
-        <alias index="42" name="" field="builtdate"/>
-        <alias index="43" name="" field="enddate"/>
-        <alias index="44" name="" field="ownercat_id"/>
-        <alias index="45" name="" field="muni_id"/>
-        <alias index="46" name="" field="postcode"/>
-        <alias index="47" name="" field="district_id"/>
-        <alias index="48" name="" field="streetname"/>
-        <alias index="49" name="" field="postnumber"/>
-        <alias index="50" name="" field="postcomplement"/>
-        <alias index="51" name="" field="streetname2"/>
-        <alias index="52" name="" field="postnumber2"/>
-        <alias index="53" name="" field="postcomplement2"/>
-        <alias index="54" name="" field="descript"/>
-        <alias index="55" name="" field="svg"/>
-        <alias index="56" name="" field="rotation"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="connectype_id"/>
-        <alias index="68" name="" field="feature_id"/>
-        <alias index="69" name="" field="featurecat_id"/>
-        <alias index="70" name="" field="pjoint_id"/>
-        <alias index="71" name="" field="pjoint_type"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="adate"/>
-        <alias index="77" name="" field="adescript"/>
-        <alias index="78" name="" field="accessibility"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="connec_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="connecat_id" name="" index="6"/>
+        <alias field="expl_id" name="" index="7"/>
+        <alias field="macroexpl_id" name="" index="8"/>
+        <alias field="sector_id" name="" index="9"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connec_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="connec_length" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="n_hydrometer" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="n_hydrometer"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connec_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="connec_length"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="n_hydrometer"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -14140,79 +13318,79 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="connec_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="connecat_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="connec_length" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="n_hydrometer" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_type" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14395,7 +13573,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -14444,11 +13622,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -14472,586 +13650,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" symbol="0" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600"/>
-          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" symbol="1" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600"/>
-          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" symbol="2" scalemindenom="600" scalemaxdenom="1600"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@1">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@2">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="angle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="&quot;arrow&quot;" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@3">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@2">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="angle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="&quot;arrow&quot;" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@3">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@1">
-                <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@2">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="angle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="&quot;arrow&quot; +180" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@3">
-                <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@4">
-                <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -15061,611 +14239,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{750be282-d4cc-4137-9551-e68430260327}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -15820,28 +14998,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15850,8 +15028,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15860,8 +15038,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15870,8 +15048,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15880,16 +15058,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -15897,8 +15078,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15907,8 +15088,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15917,23 +15098,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -15941,8 +15128,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15951,34 +15138,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15987,93 +15168,96 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="distance" field="distance"/>
-        <alias index="2" name="depth" field="depth"/>
-        <alias index="3" name="x_label" field="x_label"/>
-        <alias index="4" name="y_label" field="y_label"/>
-        <alias index="5" name="rotation_label" field="rotation_label"/>
-        <alias index="6" name="offset_label" field="offset_label"/>
-        <alias index="7" name="direction_arrow" field="direction_arrow"/>
-        <alias index="8" name="x_symbol" field="x_symbol"/>
-        <alias index="9" name="y_symbol" field="y_symbol"/>
-        <alias index="10" name="feature_id" field="feature_id"/>
-        <alias index="11" name="feature_type" field="feature_type"/>
-        <alias index="12" name="state" field="state"/>
-        <alias index="13" name="expl_id" field="expl_id"/>
-        <alias index="14" name="observ" field="observ"/>
-        <alias index="15" name="comment" field="comment"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="distance" name="distance" index="1"/>
+        <alias field="depth" name="depth" index="2"/>
+        <alias field="x_label" name="x_label" index="3"/>
+        <alias field="y_label" name="y_label" index="4"/>
+        <alias field="rotation_label" name="rotation_label" index="5"/>
+        <alias field="offset_label" name="offset_label" index="6"/>
+        <alias field="direction_arrow" name="direction_arrow" index="7"/>
+        <alias field="x_symbol" name="x_symbol" index="8"/>
+        <alias field="y_symbol" name="y_symbol" index="9"/>
+        <alias field="feature_id" name="feature_id" index="10"/>
+        <alias field="feature_type" name="feature_type" index="11"/>
+        <alias field="state" name="state" index="12"/>
+        <alias field="expl_id" name="expl_id" index="13"/>
+        <alias field="observ" name="observ" index="14"/>
+        <alias field="comment" name="comment" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="x_label" applyOnUpdate="0"/>
-        <default expression="" field="y_label" applyOnUpdate="0"/>
-        <default expression="" field="rotation_label" applyOnUpdate="0"/>
-        <default expression="" field="offset_label" applyOnUpdate="0"/>
-        <default expression="" field="direction_arrow" applyOnUpdate="0"/>
-        <default expression="" field="x_symbol" applyOnUpdate="0"/>
-        <default expression="" field="y_symbol" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_type" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="x_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="offset_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="direction_arrow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="x_symbol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_symbol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="x_label"/>
-        <constraint desc="" exp="" field="y_label"/>
-        <constraint desc="" exp="" field="rotation_label"/>
-        <constraint desc="" exp="" field="offset_label"/>
-        <constraint desc="" exp="" field="direction_arrow"/>
-        <constraint desc="" exp="" field="x_symbol"/>
-        <constraint desc="" exp="" field="y_symbol"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="feature_type"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -16081,22 +15265,23 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="distance" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="x_label" width="-1"/>
-          <column type="field" hidden="0" name="y_label" width="-1"/>
-          <column type="field" hidden="0" name="rotation_label" width="-1"/>
-          <column type="field" hidden="0" name="offset_label" width="-1"/>
-          <column type="field" hidden="0" name="direction_arrow" width="-1"/>
-          <column type="field" hidden="0" name="x_symbol" width="-1"/>
-          <column type="field" hidden="0" name="y_symbol" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_type" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16146,6 +15331,7 @@ def my_form_open(dialog, layer, feature):
         <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -16166,7 +15352,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -16221,11 +15407,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -16249,145 +15435,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="name" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category symbol="0" label="dma1-1d" value="dma1-1d" render="true"/>
-          <category symbol="1" label="dma1-2d" value="dma1-2d" render="true"/>
-          <category symbol="2" label="dma2-1d" value="dma2-1d" render="true"/>
-          <category symbol="3" label="source-1" value="source-1" render="true"/>
-          <category symbol="4" label="source-2" value="source-2" render="true"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16404,28 +15590,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="dma_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16434,8 +15620,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16444,8 +15630,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16454,8 +15640,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16464,8 +15650,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16474,8 +15660,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16484,8 +15670,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16494,8 +15680,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16504,8 +15690,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16514,8 +15700,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16524,8 +15710,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16534,8 +15720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16544,8 +15730,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16559,91 +15745,91 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="dma_id" field="dma_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="macrodma_id" field="macrodma_id"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="undelete" field="undelete"/>
-        <alias index="5" name="expl_id" field="expl_id"/>
-        <alias index="6" name="pattern_id" field="pattern_id"/>
-        <alias index="7" name="link" field="link"/>
-        <alias index="8" name="minc" field="minc"/>
-        <alias index="9" name="maxc" field="maxc"/>
-        <alias index="10" name="effc" field="effc"/>
-        <alias index="11" name="grafconfig" field="grafconfig"/>
-        <alias index="12" name="" field="stylesheet"/>
+        <alias field="dma_id" name="dma_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="macrodma_id" name="macrodma_id" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
+        <alias field="expl_id" name="expl_id" index="5"/>
+        <alias field="pattern_id" name="pattern_id" index="6"/>
+        <alias field="link" name="link" index="7"/>
+        <alias field="minc" name="minc" index="8"/>
+        <alias field="maxc" name="maxc" index="9"/>
+        <alias field="effc" name="effc" index="10"/>
+        <alias field="grafconfig" name="grafconfig" index="11"/>
+        <alias field="stylesheet" name="" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="minc" applyOnUpdate="0"/>
-        <default expression="" field="maxc" applyOnUpdate="0"/>
-        <default expression="" field="effc" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="maxc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="effc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="minc"/>
-        <constraint desc="" exp="" field="maxc"/>
-        <constraint desc="" exp="" field="effc"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{be5d940b-02fd-451d-a305-acaddf30c925}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="176"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="minc" width="-1"/>
-          <column type="field" hidden="0" name="maxc" width="-1"/>
-          <column type="field" hidden="0" name="effc" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16706,7 +15892,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="0" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -16765,7 +15951,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -16789,122 +15975,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="name" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category symbol="0" label="dqa1-1d" value="dqa1-1d" render="true"/>
-          <category symbol="1" label="dqa1-1s" value="dqa1-1s" render="true"/>
-          <category symbol="2" label="dqa2-1d" value="dqa2-1d" render="true"/>
-          <category symbol="3" label="dqa2-1s" value="dqa2-1s" render="true"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16926,22 +16112,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16950,8 +16136,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16960,8 +16146,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16970,8 +16156,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16980,8 +16166,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16990,8 +16176,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17000,8 +16186,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17010,8 +16196,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17020,8 +16206,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17030,8 +16216,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17040,8 +16226,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17055,58 +16241,58 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="dqa_id" field="dqa_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="expl_id" field="expl_id"/>
-        <alias index="3" name="macrodqa_id" field="macrodqa_id"/>
-        <alias index="4" name="descript" field="descript"/>
-        <alias index="5" name="undelete" field="undelete"/>
-        <alias index="6" name="pattern_id" field="pattern_id"/>
-        <alias index="7" name="dqa_type" field="dqa_type"/>
-        <alias index="8" name="link" field="link"/>
-        <alias index="9" name="grafconfig" field="grafconfig"/>
-        <alias index="10" name="" field="stylesheet"/>
+        <alias field="dqa_id" name="dqa_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="expl_id" name="expl_id" index="2"/>
+        <alias field="macrodqa_id" name="macrodqa_id" index="3"/>
+        <alias field="descript" name="descript" index="4"/>
+        <alias field="undelete" name="undelete" index="5"/>
+        <alias field="pattern_id" name="pattern_id" index="6"/>
+        <alias field="dqa_type" name="dqa_type" index="7"/>
+        <alias field="link" name="link" index="8"/>
+        <alias field="grafconfig" name="grafconfig" index="9"/>
+        <alias field="stylesheet" name="" index="10"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_type" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="dqa_type"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -17114,17 +16300,17 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_type" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17185,13 +16371,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="1" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -17240,11 +16420,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -17268,33 +16448,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17311,22 +16491,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17334,21 +16514,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -17356,8 +16545,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17366,41 +16555,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="95" name="CANCELED FICTICIOUS"/>
-                  <Option type="QString" value="96" name="CANCELED PLANIFIED"/>
-                  <Option type="QString" value="97" name="DONE FICTICIOUS"/>
-                  <Option type="QString" value="98" name="DONE PLANIFIED"/>
-                  <Option type="QString" value="99" name="FICTICIUS"/>
-                  <Option type="QString" value="1" name="OBSOLETE"/>
-                  <Option type="QString" value="2" name="ON_SERVICE"/>
-                  <Option type="QString" value="3" name="PLANIFIED"/>
-                  <Option type="QString" value="5" name="PROVISIONAL"/>
-                  <Option type="QString" value="4" name="RECONSTRUCT"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17409,8 +16585,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17419,8 +16595,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17429,8 +16605,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17438,42 +16614,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="Standard Category" name="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="Standard Location" name="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="Standard Fluid" name="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17481,27 +16654,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="builder1" name="builder1"/>
-                  <Option type="QString" value="builder2" name="builder2"/>
-                  <Option type="QString" value="builder3" name="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17510,8 +16685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17520,22 +16695,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="owner1" name="owner1"/>
-                  <Option type="QString" value="owner2" name="owner2"/>
-                  <Option type="QString" value="owner3" name="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17544,8 +16715,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17554,21 +16725,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="TO REVIEW" name="TO REVIEW"/>
-                  <Option type="QString" value="VERIFIED" name="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17577,8 +16745,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17587,8 +16755,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17597,8 +16765,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17607,16 +16775,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -17624,155 +16795,166 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="Element id" field="element_id"/>
-        <alias index="1" name="Code" field="code"/>
-        <alias index="2" name="Catalog" field="elementcat_id"/>
-        <alias index="3" name="elementtype_id" field="elementtype_id"/>
-        <alias index="4" name="serial_number" field="serial_number"/>
-        <alias index="5" name="State" field="state"/>
-        <alias index="6" name="State type" field="state_type"/>
-        <alias index="7" name="num_elements" field="num_elements"/>
-        <alias index="8" name="observ" field="observ"/>
-        <alias index="9" name="comment" field="comment"/>
-        <alias index="10" name="Function type" field="function_type"/>
-        <alias index="11" name="Category type" field="category_type"/>
-        <alias index="12" name="Location type" field="location_type"/>
-        <alias index="13" name="Fluid type" field="fluid_type"/>
-        <alias index="14" name="Workcat" field="workcat_id"/>
-        <alias index="15" name="Workcat end" field="workcat_id_end"/>
-        <alias index="16" name="Builder" field="buildercat_id"/>
-        <alias index="17" name="builtdate" field="builtdate"/>
-        <alias index="18" name="enddate" field="enddate"/>
-        <alias index="19" name="Owner" field="ownercat_id"/>
-        <alias index="20" name="rotation" field="rotation"/>
-        <alias index="21" name="link" field="link"/>
-        <alias index="22" name="Verified" field="verified"/>
-        <alias index="23" name="label_x" field="label_x"/>
-        <alias index="24" name="label_y" field="label_y"/>
-        <alias index="25" name="label_rotation" field="label_rotation"/>
-        <alias index="26" name="publish" field="publish"/>
-        <alias index="27" name="inventory" field="inventory"/>
-        <alias index="28" name="undelete" field="undelete"/>
-        <alias index="29" name="Exploitation" field="expl_id"/>
+        <alias field="element_id" name="Element id" index="0"/>
+        <alias field="code" name="Code" index="1"/>
+        <alias field="elementcat_id" name="Catalog" index="2"/>
+        <alias field="elementtype_id" name="elementtype_id" index="3"/>
+        <alias field="serial_number" name="serial_number" index="4"/>
+        <alias field="state" name="State" index="5"/>
+        <alias field="state_type" name="State type" index="6"/>
+        <alias field="num_elements" name="num_elements" index="7"/>
+        <alias field="observ" name="observ" index="8"/>
+        <alias field="comment" name="comment" index="9"/>
+        <alias field="function_type" name="Function type" index="10"/>
+        <alias field="category_type" name="Category type" index="11"/>
+        <alias field="location_type" name="Location type" index="12"/>
+        <alias field="fluid_type" name="Fluid type" index="13"/>
+        <alias field="workcat_id" name="Workcat" index="14"/>
+        <alias field="workcat_id_end" name="Workcat end" index="15"/>
+        <alias field="buildercat_id" name="Builder" index="16"/>
+        <alias field="builtdate" name="builtdate" index="17"/>
+        <alias field="enddate" name="enddate" index="18"/>
+        <alias field="ownercat_id" name="Owner" index="19"/>
+        <alias field="rotation" name="rotation" index="20"/>
+        <alias field="link" name="link" index="21"/>
+        <alias field="verified" name="Verified" index="22"/>
+        <alias field="label_x" name="label_x" index="23"/>
+        <alias field="label_y" name="label_y" index="24"/>
+        <alias field="label_rotation" name="label_rotation" index="25"/>
+        <alias field="publish" name="publish" index="26"/>
+        <alias field="inventory" name="inventory" index="27"/>
+        <alias field="undelete" name="undelete" index="28"/>
+        <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="element_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elementcat_id" applyOnUpdate="0"/>
-        <default expression="" field="elementtype_id" applyOnUpdate="0"/>
-        <default expression="" field="serial_number" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="num_elements" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="element_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elementcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elementtype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="serial_number"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_elements"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="element_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elementcat_id"/>
-        <constraint desc="" exp="" field="elementtype_id"/>
-        <constraint desc="" exp="" field="serial_number"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="num_elements"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -17780,37 +16962,38 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="element_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elementcat_id" width="-1"/>
-          <column type="field" hidden="0" name="serial_number" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="num_elements" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="elementtype_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17863,6 +17046,7 @@ def my_form_open(dialog, layer, feature):
         <field name="num_elements" editable="1"/>
         <field name="observ" editable="1"/>
         <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
         <field name="publish" editable="1"/>
         <field name="rotation" editable="1"/>
         <field name="serial_number" editable="1"/>
@@ -17895,6 +17079,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -17916,7 +17101,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -17975,7 +17160,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -17999,26 +17184,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18035,38 +17220,44 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="expl_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18075,20 +17266,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Macroexploitation-1"/>
-                  <Option type="QString" value="0" name="Undefined"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18097,60 +17286,69 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="expl_id" field="expl_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="macroexpl_id" field="macroexpl_id"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="undelete" field="undelete"/>
-        <alias index="5" name="tstamp" field="tstamp"/>
+        <alias field="expl_id" name="expl_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="macroexpl_id" name="macroexpl_id" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
+        <alias field="tstamp" name="tstamp" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="tstamp"/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -18158,13 +17356,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="168"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18215,7 +17413,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18281,33 +17479,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="164,113,88,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18320,7 +17518,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -18434,74 +17632,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="connecat_id"/>
-        <alias index="4" name="" field="arc_id"/>
-        <alias index="5" name="" field="sector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="pjoint_type"/>
-        <alias index="12" name="" field="pjoint_id"/>
-        <alias index="13" name="" field="demand"/>
-        <alias index="14" name="" field="pattern_id"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="connecat_id" name="" index="3"/>
+        <alias field="arc_id" name="" index="4"/>
+        <alias field="sector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="pjoint_type" name="" index="11"/>
+        <alias field="pjoint_id" name="" index="12"/>
+        <alias field="demand" name="" index="13"/>
+        <alias field="pattern_id" name="" index="14"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -18528,7 +17726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_edit_inp_demand20180212154336936</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_demand" sql=</datasource>
       <keywordList>
@@ -18555,6 +17753,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -18568,10 +17775,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -18593,7 +17808,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18602,18 +17817,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="node_id">
+        <field name="feature_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18622,92 +17837,90 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="deman_type">
-          <editWidget type="ValueMap">
+        <field name="demand_type">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="2" name="CRM PERIOD"/>
-                  <Option type="QString" value="1" name="ESTIMATED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dscenario_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Hydrants_50%"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="feature_type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="demand" field="demand"/>
-        <alias index="3" name="pattern_id" field="pattern_id"/>
-        <alias index="4" name="deman_type" field="deman_type"/>
-        <alias index="5" name="dscenario_id" field="dscenario_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="feature_id" name="" index="1"/>
+        <alias field="demand" name="demand" index="2"/>
+        <alias field="pattern_id" name="pattern_id" index="3"/>
+        <alias field="demand_type" name="" index="4"/>
+        <alias field="dscenario_id" name="dscenario_id" index="5"/>
+        <alias field="feature_type" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="deman_type" applyOnUpdate="0"/>
-        <default expression="" field="dscenario_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="demand_type" expression=""/>
+        <default applyOnUpdate="0" field="dscenario_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="deman_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dscenario_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dscenario_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="deman_type"/>
-        <constraint desc="" exp="" field="dscenario_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="demand_type" desc=""/>
+        <constraint exp="" field="dscenario_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -18715,13 +17928,14 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="demand" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="deman_type" width="-1"/>
-          <column type="field" hidden="0" name="dscenario_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dscenario_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="demand_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18755,17 +17969,28 @@ def my_form_open(dialog, layer, feature):
       <editable>
         <field name="deman_type" editable="1"/>
         <field name="demand" editable="1"/>
+        <field name="demand_type" editable="1"/>
         <field name="dscenario_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
         <field name="id" editable="1"/>
         <field name="node_id" editable="1"/>
         <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="demand"/>
+        <field labelOnTop="0" name="demand_type"/>
+        <field labelOnTop="0" name="dscenario_id"/>
+        <field labelOnTop="0" name="feature_id"/>
+        <field labelOnTop="0" name="feature_type"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18831,33 +18056,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="135,221,121,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="135,221,121,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18870,7 +18095,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19005,86 +18230,86 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="initlevel"/>
-        <alias index="12" name="" field="minlevel"/>
-        <alias index="13" name="" field="maxlevel"/>
-        <alias index="14" name="" field="diameter"/>
-        <alias index="15" name="" field="minvol"/>
-        <alias index="16" name="" field="curve_id"/>
-        <alias index="17" name="" field="pattern_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="initlevel" name="" index="11"/>
+        <alias field="minlevel" name="" index="12"/>
+        <alias field="maxlevel" name="" index="13"/>
+        <alias field="diameter" name="" index="14"/>
+        <alias field="minvol" name="" index="15"/>
+        <alias field="curve_id" name="" index="16"/>
+        <alias field="pattern_id" name="" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="initlevel" applyOnUpdate="0"/>
-        <default expression="" field="minlevel" applyOnUpdate="0"/>
-        <default expression="" field="maxlevel" applyOnUpdate="0"/>
-        <default expression="" field="diameter" applyOnUpdate="0"/>
-        <default expression="" field="minvol" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="initlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="maxlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="diameter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minvol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="initlevel"/>
-        <constraint desc="" exp="" field="minlevel"/>
-        <constraint desc="" exp="" field="maxlevel"/>
-        <constraint desc="" exp="" field="diameter"/>
-        <constraint desc="" exp="" field="minvol"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -19111,7 +18336,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19177,33 +18402,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19216,7 +18441,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19309,62 +18534,62 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="demand"/>
-        <alias index="11" name="" field="pattern_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="demand" name="" index="10"/>
+        <alias field="pattern_id" name="" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -19391,7 +18616,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19457,37 +18682,37 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="30,128,239,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="30,128,239,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineWidth">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19500,7 +18725,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19621,78 +18846,78 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="node_1"/>
-        <alias index="2" name="" field="node_2"/>
-        <alias index="3" name="" field="arccat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="custom_length"/>
-        <alias index="12" name="" field="minorloss"/>
-        <alias index="13" name="" field="status"/>
-        <alias index="14" name="" field="custom_roughness"/>
-        <alias index="15" name="" field="custom_dint"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="node_1" name="" index="1"/>
+        <alias field="node_2" name="" index="2"/>
+        <alias field="arccat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="custom_length" name="" index="11"/>
+        <alias field="minorloss" name="" index="12"/>
+        <alias field="status" name="" index="13"/>
+        <alias field="custom_roughness" name="" index="14"/>
+        <alias field="custom_dint" name="" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="custom_length" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="custom_roughness" applyOnUpdate="0"/>
-        <default expression="" field="custom_dint" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="custom_roughness" expression=""/>
+        <default applyOnUpdate="0" field="custom_dint" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_roughness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_dint"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_roughness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_dint" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="custom_length"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="custom_roughness"/>
-        <constraint desc="" exp="" field="custom_dint"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="custom_roughness" desc=""/>
+        <constraint exp="" field="custom_dint" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -19719,7 +18944,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19785,33 +19010,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="92,146,179,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="92,146,179,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19824,7 +19049,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19959,86 +19184,86 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="state"/>
-        <alias index="7" name="" field="state_type"/>
-        <alias index="8" name="" field="annotation"/>
-        <alias index="9" name="" field="expl_id"/>
-        <alias index="10" name="" field="dma_id"/>
-        <alias index="11" name="" field="power"/>
-        <alias index="12" name="" field="curve_id"/>
-        <alias index="13" name="" field="speed"/>
-        <alias index="14" name="" field="pattern"/>
-        <alias index="15" name="" field="to_arc"/>
-        <alias index="16" name="" field="status"/>
-        <alias index="17" name="" field="pump_type"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="state" name="" index="6"/>
+        <alias field="state_type" name="" index="7"/>
+        <alias field="annotation" name="" index="8"/>
+        <alias field="expl_id" name="" index="9"/>
+        <alias field="dma_id" name="" index="10"/>
+        <alias field="power" name="" index="11"/>
+        <alias field="curve_id" name="" index="12"/>
+        <alias field="speed" name="" index="13"/>
+        <alias field="pattern" name="" index="14"/>
+        <alias field="to_arc" name="" index="15"/>
+        <alias field="status" name="" index="16"/>
+        <alias field="pump_type" name="" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="power" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="speed" applyOnUpdate="0"/>
-        <default expression="" field="pattern" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="pump_type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="pump_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="power"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="speed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pump_type"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pump_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="power"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="speed"/>
-        <constraint desc="" exp="" field="pattern"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="pump_type"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="pump_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20065,7 +19290,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20131,33 +19356,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,203,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,203,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20170,7 +19395,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -20263,62 +19488,62 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="pattern_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="pattern_id" name="" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20345,7 +19570,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20411,33 +19636,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20450,7 +19675,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -20557,70 +19782,70 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="minorloss"/>
-        <alias index="12" name="" field="to_arc"/>
-        <alias index="13" name="" field="status"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="minorloss" name="" index="11"/>
+        <alias field="to_arc" name="" index="12"/>
+        <alias field="status" name="" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20647,7 +19872,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) sql=</datasource>
       <keywordList>
@@ -20707,33 +19932,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20746,7 +19971,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -20874,82 +20099,82 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="initlevel"/>
-        <alias index="12" name="" field="minlevel"/>
-        <alias index="13" name="" field="maxlevel"/>
-        <alias index="14" name="" field="diameter"/>
-        <alias index="15" name="" field="minvol"/>
-        <alias index="16" name="" field="curve_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="initlevel" name="" index="11"/>
+        <alias field="minlevel" name="" index="12"/>
+        <alias field="maxlevel" name="" index="13"/>
+        <alias field="diameter" name="" index="14"/>
+        <alias field="minvol" name="" index="15"/>
+        <alias field="curve_id" name="" index="16"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="initlevel" applyOnUpdate="0"/>
-        <default expression="" field="minlevel" applyOnUpdate="0"/>
-        <default expression="" field="maxlevel" applyOnUpdate="0"/>
-        <default expression="" field="diameter" applyOnUpdate="0"/>
-        <default expression="" field="minvol" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="initlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="maxlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="diameter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minvol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="initlevel"/>
-        <constraint desc="" exp="" field="minlevel"/>
-        <constraint desc="" exp="" field="maxlevel"/>
-        <constraint desc="" exp="" field="diameter"/>
-        <constraint desc="" exp="" field="minvol"/>
-        <constraint desc="" exp="" field="curve_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20976,7 +20201,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -21042,33 +20267,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="130,85,101,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="130,85,101,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21081,7 +20306,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -21216,86 +20441,86 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="state"/>
-        <alias index="7" name="" field="state_type"/>
-        <alias index="8" name="" field="annotation"/>
-        <alias index="9" name="" field="expl_id"/>
-        <alias index="10" name="" field="valv_type"/>
-        <alias index="11" name="" field="pressure"/>
-        <alias index="12" name="" field="flow"/>
-        <alias index="13" name="" field="coef_loss"/>
-        <alias index="14" name="" field="curve_id"/>
-        <alias index="15" name="" field="minorloss"/>
-        <alias index="16" name="" field="to_arc"/>
-        <alias index="17" name="" field="status"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="state" name="" index="6"/>
+        <alias field="state_type" name="" index="7"/>
+        <alias field="annotation" name="" index="8"/>
+        <alias field="expl_id" name="" index="9"/>
+        <alias field="valv_type" name="" index="10"/>
+        <alias field="pressure" name="" index="11"/>
+        <alias field="flow" name="" index="12"/>
+        <alias field="coef_loss" name="" index="13"/>
+        <alias field="curve_id" name="" index="14"/>
+        <alias field="minorloss" name="" index="15"/>
+        <alias field="to_arc" name="" index="16"/>
+        <alias field="status" name="" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="valv_type" applyOnUpdate="0"/>
-        <default expression="" field="pressure" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="coef_loss" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="valv_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="coef_loss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="valv_type"/>
-        <constraint desc="" exp="" field="pressure"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="coef_loss"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -21322,7 +20547,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) sql=</datasource>
       <keywordList>
@@ -21382,31 +20607,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="111,182,175,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="111,182,175,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21419,7 +20644,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -21575,98 +20800,98 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="node_1"/>
-        <alias index="2" name="" field="node_2"/>
-        <alias index="3" name="" field="elevation"/>
-        <alias index="4" name="" field="depth"/>
-        <alias index="5" name="" field="arccat_id"/>
-        <alias index="6" name="" field="sector_id"/>
-        <alias index="7" name="" field="macrosector_id"/>
-        <alias index="8" name="" field="dma_id"/>
-        <alias index="9" name="" field="state"/>
-        <alias index="10" name="" field="state_type"/>
-        <alias index="11" name="" field="annotation"/>
-        <alias index="12" name="" field="expl_id"/>
-        <alias index="13" name="" field="valv_type"/>
-        <alias index="14" name="" field="pressure"/>
-        <alias index="15" name="" field="flow"/>
-        <alias index="16" name="" field="coef_loss"/>
-        <alias index="17" name="" field="curve_id"/>
-        <alias index="18" name="" field="minorloss"/>
-        <alias index="19" name="" field="to_arc"/>
-        <alias index="20" name="" field="status"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="node_1" name="" index="1"/>
+        <alias field="node_2" name="" index="2"/>
+        <alias field="elevation" name="" index="3"/>
+        <alias field="depth" name="" index="4"/>
+        <alias field="arccat_id" name="" index="5"/>
+        <alias field="sector_id" name="" index="6"/>
+        <alias field="macrosector_id" name="" index="7"/>
+        <alias field="dma_id" name="" index="8"/>
+        <alias field="state" name="" index="9"/>
+        <alias field="state_type" name="" index="10"/>
+        <alias field="annotation" name="" index="11"/>
+        <alias field="expl_id" name="" index="12"/>
+        <alias field="valv_type" name="" index="13"/>
+        <alias field="pressure" name="" index="14"/>
+        <alias field="flow" name="" index="15"/>
+        <alias field="coef_loss" name="" index="16"/>
+        <alias field="curve_id" name="" index="17"/>
+        <alias field="minorloss" name="" index="18"/>
+        <alias field="to_arc" name="" index="19"/>
+        <alias field="status" name="" index="20"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="valv_type" applyOnUpdate="0"/>
-        <default expression="" field="pressure" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="coef_loss" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="valv_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="coef_loss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="valv_type"/>
-        <constraint desc="" exp="" field="pressure"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="coef_loss"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -21693,7 +20918,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="1" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -21749,11 +20974,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -21777,69 +21002,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@1">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -21858,28 +21083,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="1" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="link_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21888,24 +21113,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ARC" name="ARC"/>
-                  <Option type="QString" value="CONNEC" name="CONNEC"/>
-                  <Option type="QString" value="ELEMENT" name="ELEMENT"/>
-                  <Option type="QString" value="LINK" name="LINK"/>
-                  <Option type="QString" value="NODE" name="NODE"/>
-                  <Option type="QString" value="VNODE" name="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21914,24 +21133,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ARC" name="ARC"/>
-                  <Option type="QString" value="CONNEC" name="CONNEC"/>
-                  <Option type="QString" value="ELEMENT" name="ELEMENT"/>
-                  <Option type="QString" value="LINK" name="LINK"/>
-                  <Option type="QString" value="NODE" name="NODE"/>
-                  <Option type="QString" value="VNODE" name="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21940,92 +21153,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="macrosector_01"/>
-                  <Option type="QString" value="2" name="macrosector_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="dma1-1d"/>
-                  <Option type="QString" value="2" name="dma1-2d"/>
-                  <Option type="QString" value="3" name="dma2-1d"/>
-                  <Option type="QString" value="4" name="source-1"/>
-                  <Option type="QString" value="5" name="source-2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="macrodma_01"/>
-                  <Option type="QString" value="2" name="macrodma_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22034,8 +21223,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22044,8 +21233,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22053,109 +21242,121 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="link_id" field="link_id"/>
-        <alias index="1" name="feature_type" field="feature_type"/>
-        <alias index="2" name="feature_id" field="feature_id"/>
-        <alias index="3" name="exit_type" field="exit_type"/>
-        <alias index="4" name="exit_id" field="exit_id"/>
-        <alias index="5" name="sector_id" field="sector_id"/>
-        <alias index="6" name="macrosector_id" field="macrosector_id"/>
-        <alias index="7" name="dma_id" field="dma_id"/>
-        <alias index="8" name="macrodma_id" field="macrodma_id"/>
-        <alias index="9" name="expl_id" field="expl_id"/>
-        <alias index="10" name="state" field="state"/>
-        <alias index="11" name="gis_length" field="gis_length"/>
-        <alias index="12" name="userdefined_geom" field="userdefined_geom"/>
-        <alias index="13" name="ispsectorgeom" field="ispsectorgeom"/>
-        <alias index="14" name="psector_rowid" field="psector_rowid"/>
-        <alias index="15" name="" field="fluid_type"/>
-        <alias index="16" name="" field="vnode_topelev"/>
+        <alias field="link_id" name="link_id" index="0"/>
+        <alias field="feature_type" name="feature_type" index="1"/>
+        <alias field="feature_id" name="feature_id" index="2"/>
+        <alias field="exit_type" name="exit_type" index="3"/>
+        <alias field="exit_id" name="exit_id" index="4"/>
+        <alias field="sector_id" name="sector_id" index="5"/>
+        <alias field="macrosector_id" name="macrosector_id" index="6"/>
+        <alias field="dma_id" name="dma_id" index="7"/>
+        <alias field="macrodma_id" name="macrodma_id" index="8"/>
+        <alias field="expl_id" name="expl_id" index="9"/>
+        <alias field="state" name="state" index="10"/>
+        <alias field="gis_length" name="gis_length" index="11"/>
+        <alias field="userdefined_geom" name="userdefined_geom" index="12"/>
+        <alias field="ispsectorgeom" name="ispsectorgeom" index="13"/>
+        <alias field="psector_rowid" name="psector_rowid" index="14"/>
+        <alias field="fluid_type" name="" index="15"/>
+        <alias field="vnode_topelev" name="" index="16"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="link_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_type" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="gis_length" applyOnUpdate="0"/>
-        <default expression="" field="userdefined_geom" applyOnUpdate="0"/>
-        <default expression="" field="ispsectorgeom" applyOnUpdate="0"/>
-        <default expression="" field="psector_rowid" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="vnode_topelev" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="2" constraints="3" field="link_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gis_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="userdefined_geom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ispsectorgeom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="psector_rowid"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vnode_topelev"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="link_id"/>
-        <constraint desc="" exp="" field="feature_type"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="gis_length"/>
-        <constraint desc="" exp="" field="userdefined_geom"/>
-        <constraint desc="" exp="" field="ispsectorgeom"/>
-        <constraint desc="" exp="" field="psector_rowid"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="vnode_topelev"/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -22163,24 +21364,24 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="link_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_type" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="gis_length" width="-1"/>
-          <column type="field" hidden="0" name="userdefined_geom" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="ispsectorgeom" width="-1"/>
-          <column type="field" hidden="0" name="psector_rowid" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="vnode_topelev" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22253,7 +21454,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -22286,6 +21487,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22302,7 +21512,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -22319,26 +21537,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="137,1,152,0"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.86"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="137,1,152,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.86" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22355,46 +21573,55 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="macrodma_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="macrodma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macrodma_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -22402,80 +21629,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macrodma_id" field="macrodma_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="undelete" field="undelete"/>
-        <alias index="4" name="expl_id" field="expl_id"/>
+        <alias field="macrodma_id" name="macrodma_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="undelete" name="undelete" index="3"/>
+        <alias field="expl_id" name="expl_id" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macrodma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{a5136806-90c7-449b-91ff-61142b51cdbd}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be9c3210-e9e0-4e37-884f-7fcffda95a7d}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="176"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22524,7 +21751,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="0" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_macrodqa" (the_geom) sql=</datasource>
       <keywordList>
@@ -22551,6 +21778,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22567,7 +21803,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -22584,26 +21828,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.86"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.86" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22620,49 +21864,58 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macrodqa_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22670,47 +21923,53 @@ def my_form_open(dialog, layer, feature):
         <field name="descript">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macrodqa_id" field="macrodqa_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="expl_id" field="expl_id"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="undelete" field="undelete"/>
+        <alias field="macrodqa_id" name="macrodqa_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="expl_id" name="expl_id" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macrodqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -22718,12 +21977,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22772,7 +22031,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -22805,6 +22064,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22821,7 +22089,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -22838,26 +22114,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="0.796078" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,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="255,0,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="1"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="0.796078" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="1" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22874,37 +22150,49 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macrosector_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -22912,45 +22200,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macrosector_id" field="macrosector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="undelete" field="undelete"/>
+        <alias field="macrosector_id" name="macrosector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="undelete" name="undelete" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macrosector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -22958,11 +22249,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="name" width="172"/>
-          <column type="field" hidden="0" name="descript" width="184"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23009,7 +22300,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -23068,7 +22359,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -23092,989 +22383,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" symbol="0" label="Wtp" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000"/>
-          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" symbol="1" label="Waterwell" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000"/>
-          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" symbol="2" label="Source" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000"/>
-          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" symbol="3" label="Tank" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000"/>
-          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" symbol="4" label="Expantank" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500"/>
-          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" symbol="5" label="Filter" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500"/>
-          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" symbol="6" label="Flexunion" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500"/>
-          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" symbol="7" label="Hydrant" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500"/>
-          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" symbol="8" label="Meter" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500"/>
-          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" symbol="9" label="Netelement" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500"/>
-          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" symbol="10" label="Netsamplepoint" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500"/>
-          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" symbol="11" label="Pump" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500"/>
-          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" symbol="12" label="Register" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500"/>
-          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" symbol="13" label="Manhole" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500"/>
-          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" symbol="14" label="Reduction" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500"/>
-          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" symbol="15" label="Valve" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500"/>
-          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" symbol="16" label="Junction" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500"/>
-          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" symbol="17" label="Netwjoin" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="10">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="11">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="12">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="13">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="14">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="15">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="16">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="17">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="6">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="7">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="8">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="9">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24090,22 +23381,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24651,322 +23942,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -24974,75 +24265,75 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25217,7 +24508,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -25250,6 +24541,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -25263,10 +24563,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -25283,33 +24591,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="22,186,107,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="22,186,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25318,11 +24626,29 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25331,19 +24657,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="visitcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Test"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25352,8 +24677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25362,8 +24687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25372,8 +24697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25382,8 +24707,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25392,67 +24717,64 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="visitcat_id" field="visitcat_id"/>
-        <alias index="2" name="ext_code" field="ext_code"/>
-        <alias index="3" name="startdate" field="startdate"/>
-        <alias index="4" name="enddate" field="enddate"/>
-        <alias index="5" name="user_name" field="user_name"/>
-        <alias index="6" name="webclient_id" field="webclient_id"/>
-        <alias index="7" name="expl_id" field="expl_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="visitcat_id" name="visitcat_id" index="1"/>
+        <alias field="ext_code" name="ext_code" index="2"/>
+        <alias field="startdate" name="startdate" index="3"/>
+        <alias field="enddate" name="enddate" index="4"/>
+        <alias field="user_name" name="user_name" index="5"/>
+        <alias field="webclient_id" name="webclient_id" index="6"/>
+        <alias field="expl_id" name="expl_id" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="visitcat_id" applyOnUpdate="0"/>
-        <default expression="" field="ext_code" applyOnUpdate="0"/>
-        <default expression="" field="startdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="user_name" applyOnUpdate="0"/>
-        <default expression="" field="webclient_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="visitcat_id" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="startdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="user_name" expression=""/>
+        <default applyOnUpdate="0" field="webclient_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="visitcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ext_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="startdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="user_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="webclient_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="visitcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="startdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="user_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="webclient_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="visitcat_id"/>
-        <constraint desc="" exp="" field="ext_code"/>
-        <constraint desc="" exp="" field="startdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="user_name"/>
-        <constraint desc="" exp="" field="webclient_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="visitcat_id" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="startdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="user_name" desc=""/>
+        <constraint exp="" field="webclient_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -25460,13 +24782,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="startdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="user_name" width="-1"/>
-          <column type="field" hidden="0" name="webclient_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="startdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="user_name"/>
+          <column type="field" width="-1" hidden="0" name="webclient_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="visitcat_id"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25478,7 +24802,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -25491,12 +24831,21 @@ def my_form_open(dialog, layer, feature):
         <field name="visitcat_id" editable="1"/>
         <field name="webclient_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="enddate"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="startdate"/>
+        <field labelOnTop="0" name="user_name"/>
+        <field labelOnTop="0" name="visitcat_id"/>
+        <field labelOnTop="0" name="webclient_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "user_name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="100000" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -25529,6 +24878,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -25542,10 +24900,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -25562,26 +24928,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="227,92,92,63"/>
-              <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="166,206,227,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.75"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="227,92,92,63" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="166,206,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.75" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25592,61 +24958,85 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="231,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="name" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="10" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="231,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="10" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
-                  </Option>
-                </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PolygonGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;rotation&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -25660,38 +25050,44 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="psector_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="psector_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="psector_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25700,8 +25096,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25710,36 +25106,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="priority">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="HIGH_PRIORITY" name="HIGH_PRIORITY"/>
-                  <Option type="QString" value="LOW_PRIORITY" name="LOW_PRIORITY"/>
-                  <Option type="QString" value="NORMAL_PRIORITY" name="NORMAL_PRIORITY"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="text1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -25747,8 +25146,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25757,8 +25156,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25767,24 +25166,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25793,8 +25186,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25803,16 +25196,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -25820,32 +25216,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Planified"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25854,112 +25246,118 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ext_code">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="psector_id" field="psector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="priority" field="priority"/>
-        <alias index="4" name="text1" field="text1"/>
-        <alias index="5" name="text2" field="text2"/>
-        <alias index="6" name="observ" field="observ"/>
-        <alias index="7" name="rotation" field="rotation"/>
-        <alias index="8" name="scale" field="scale"/>
-        <alias index="9" name="sector_id" field="sector_id"/>
-        <alias index="10" name="atlas_id" field="atlas_id"/>
-        <alias index="11" name="gexpenses" field="gexpenses"/>
-        <alias index="12" name="vat" field="vat"/>
-        <alias index="13" name="other" field="other"/>
-        <alias index="14" name="expl_id" field="expl_id"/>
-        <alias index="15" name="psector_type" field="psector_type"/>
-        <alias index="16" name="active" field="active"/>
-        <alias index="17" name="ext_code" field="ext_code"/>
-        <alias index="18" name="status" field="status"/>
+        <alias field="psector_id" name="psector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="priority" name="priority" index="3"/>
+        <alias field="text1" name="text1" index="4"/>
+        <alias field="text2" name="text2" index="5"/>
+        <alias field="observ" name="observ" index="6"/>
+        <alias field="rotation" name="rotation" index="7"/>
+        <alias field="scale" name="scale" index="8"/>
+        <alias field="sector_id" name="sector_id" index="9"/>
+        <alias field="atlas_id" name="atlas_id" index="10"/>
+        <alias field="gexpenses" name="gexpenses" index="11"/>
+        <alias field="vat" name="vat" index="12"/>
+        <alias field="other" name="other" index="13"/>
+        <alias field="expl_id" name="expl_id" index="14"/>
+        <alias field="psector_type" name="psector_type" index="15"/>
+        <alias field="active" name="active" index="16"/>
+        <alias field="ext_code" name="ext_code" index="17"/>
+        <alias field="status" name="status" index="18"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="psector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="priority" applyOnUpdate="0"/>
-        <default expression="" field="text1" applyOnUpdate="0"/>
-        <default expression="" field="text2" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="scale" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="atlas_id" applyOnUpdate="0"/>
-        <default expression="" field="gexpenses" applyOnUpdate="0"/>
-        <default expression="" field="vat" applyOnUpdate="0"/>
-        <default expression="" field="other" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="psector_type" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="ext_code" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="psector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="priority" expression=""/>
+        <default applyOnUpdate="0" field="text1" expression=""/>
+        <default applyOnUpdate="0" field="text2" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="scale" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="atlas_id" expression=""/>
+        <default applyOnUpdate="0" field="gexpenses" expression=""/>
+        <default applyOnUpdate="0" field="vat" expression=""/>
+        <default applyOnUpdate="0" field="other" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="psector_type" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="psector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="priority"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="scale"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="atlas_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gexpenses"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vat"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="psector_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ext_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="psector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="priority" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="scale" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="atlas_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gexpenses" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="psector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="priority"/>
-        <constraint desc="" exp="" field="text1"/>
-        <constraint desc="" exp="" field="text2"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="scale"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="atlas_id"/>
-        <constraint desc="" exp="" field="gexpenses"/>
-        <constraint desc="" exp="" field="vat"/>
-        <constraint desc="" exp="" field="other"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="psector_type"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="ext_code"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="psector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="priority" desc=""/>
+        <constraint exp="" field="text1" desc=""/>
+        <constraint exp="" field="text2" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="scale" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="atlas_id" desc=""/>
+        <constraint exp="" field="gexpenses" desc=""/>
+        <constraint exp="" field="vat" desc=""/>
+        <constraint exp="" field="other" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="psector_type" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -25967,26 +25365,26 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="psector_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="206"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="priority" width="133"/>
-          <column type="field" hidden="0" name="text1" width="-1"/>
-          <column type="field" hidden="0" name="text2" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="234"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="scale" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="atlas_id" width="-1"/>
-          <column type="field" hidden="0" name="gexpenses" width="-1"/>
-          <column type="field" hidden="0" name="vat" width="-1"/>
-          <column type="field" hidden="0" name="other" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="psector_type" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="field" hidden="0" name="ext_code" width="-1"/>
-          <column type="field" hidden="0" name="status" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="psector_id"/>
+          <column type="field" width="206" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="133" hidden="0" name="priority"/>
+          <column type="field" width="-1" hidden="0" name="text1"/>
+          <column type="field" width="-1" hidden="0" name="text2"/>
+          <column type="field" width="234" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="scale"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="atlas_id"/>
+          <column type="field" width="-1" hidden="0" name="gexpenses"/>
+          <column type="field" width="-1" hidden="0" name="vat"/>
+          <column type="field" width="-1" hidden="0" name="other"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="psector_type"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26038,12 +25436,32 @@ def my_form_open(dialog, layer, feature):
         <field name="text2" editable="1"/>
         <field name="vat" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="active"/>
+        <field labelOnTop="0" name="atlas_id"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="gexpenses"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="observ"/>
+        <field labelOnTop="0" name="other"/>
+        <field labelOnTop="0" name="priority"/>
+        <field labelOnTop="0" name="psector_id"/>
+        <field labelOnTop="0" name="psector_type"/>
+        <field labelOnTop="0" name="rotation"/>
+        <field labelOnTop="0" name="scale"/>
+        <field labelOnTop="0" name="sector_id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="text1"/>
+        <field labelOnTop="0" name="text2"/>
+        <field labelOnTop="0" name="vat"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -26102,7 +25520,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -26126,168 +25544,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="name" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category symbol="0" label="pzone1-1d" value="pzone1-1d" render="true"/>
-          <category symbol="1" label="pzone1-1s" value="pzone1-1s" render="true"/>
-          <category symbol="2" label="pzone1-2d" value="pzone1-2d" render="true"/>
-          <category symbol="3" label="pzone1-2s" value="pzone1-2s" render="true"/>
-          <category symbol="4" label="pzone2-1s" value="pzone2-1s" render="true"/>
-          <category symbol="5" label="pzone2-2d" value="pzone2-2d" render="true"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="4">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="5">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26304,28 +25722,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -26374,38 +25792,38 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="presszone_id"/>
-        <alias index="1" name="" field="name"/>
-        <alias index="2" name="" field="expl_id"/>
-        <alias index="3" name="" field="grafconfig"/>
-        <alias index="4" name="" field="head"/>
-        <alias index="5" name="" field="stylesheet"/>
+        <alias field="presszone_id" name="" index="0"/>
+        <alias field="name" name="" index="1"/>
+        <alias field="expl_id" name="" index="2"/>
+        <alias field="grafconfig" name="" index="3"/>
+        <alias field="head" name="" index="4"/>
+        <alias field="stylesheet" name="" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -26413,13 +25831,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
-          <column type="field" hidden="0" name="head" width="-1"/>
-          <column type="field" hidden="0" name="stylesheet" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26470,7 +25888,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="5000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="1" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -26519,11 +25937,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -26547,59 +25965,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26616,28 +26034,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer lowerHeight="0" upperHeight="50" upperWidth="50" diagramType="Histogram" classificationAttributeExpression="" upperValue="0" attributeLegend="1" lowerValue="0" lowerWidth="0">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="sample_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26646,8 +26064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26656,8 +26074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26666,8 +26084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26676,112 +26094,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ADAPTATION" name="ADAPTATION"/>
-                  <Option type="QString" value="AIR_VALVE" name="AIR_VALVE"/>
-                  <Option type="QString" value="BYPASS_REGISTER" name="BYPASS_REGISTER"/>
-                  <Option type="QString" value="CHECK_VALVE" name="CHECK_VALVE"/>
-                  <Option type="QString" value="CLORINATHOR" name="CLORINATHOR"/>
-                  <Option type="QString" value="CONTROL_REGISTER" name="CONTROL_REGISTER"/>
-                  <Option type="QString" value="CURVE" name="CURVE"/>
-                  <Option type="QString" value="ENDLINE" name="ENDLINE"/>
-                  <Option type="QString" value="EXPANTANK" name="EXPANTANK"/>
-                  <Option type="QString" value="FILTER" name="FILTER"/>
-                  <Option type="QString" value="FLEXUNION" name="FLEXUNION"/>
-                  <Option type="QString" value="FLOWMETER" name="FLOWMETER"/>
-                  <Option type="QString" value="FL_CONTR_VALVE" name="FL_CONTR_VALVE"/>
-                  <Option type="QString" value="FOUNTAIN" name="FOUNTAIN"/>
-                  <Option type="QString" value="GEN_PURP_VALVE" name="GEN_PURP_VALVE"/>
-                  <Option type="QString" value="GREENTAP" name="GREENTAP"/>
-                  <Option type="QString" value="GREEN_VALVE" name="GREEN_VALVE"/>
-                  <Option type="QString" value="HYDRANT" name="HYDRANT"/>
-                  <Option type="QString" value="JUNCTION" name="JUNCTION"/>
-                  <Option type="QString" value="MANHOLE" name="MANHOLE"/>
-                  <Option type="QString" value="NETELEMENT" name="NETELEMENT"/>
-                  <Option type="QString" value="NETSAMPLEPOINT" name="NETSAMPLEPOINT"/>
-                  <Option type="QString" value="OUTFALL_VALVE" name="OUTFALL_VALVE"/>
-                  <Option type="QString" value="PIPE" name="PIPE"/>
-                  <Option type="QString" value="PRESSURE_METER" name="PRESSURE_METER"/>
-                  <Option type="QString" value="PR_BREAK_VALVE" name="PR_BREAK_VALVE"/>
-                  <Option type="QString" value="PR_REDUC_VALVE" name="PR_REDUC_VALVE"/>
-                  <Option type="QString" value="PR_SUSTA_VALVE" name="PR_SUSTA_VALVE"/>
-                  <Option type="QString" value="PUMP" name="PUMP"/>
-                  <Option type="QString" value="REDUCTION" name="REDUCTION"/>
-                  <Option type="QString" value="REGISTER" name="REGISTER"/>
-                  <Option type="QString" value="SHUTOFF_VALVE" name="SHUTOFF_VALVE"/>
-                  <Option type="QString" value="SOURCE" name="SOURCE"/>
-                  <Option type="QString" value="T" name="T"/>
-                  <Option type="QString" value="TANK" name="TANK"/>
-                  <Option type="QString" value="TAP" name="TAP"/>
-                  <Option type="QString" value="THROTTLE_VALVE" name="THROTTLE_VALVE"/>
-                  <Option type="QString" value="VALVE_REGISTER" name="VALVE_REGISTER"/>
-                  <Option type="QString" value="VARC" name="VARC"/>
-                  <Option type="QString" value="VCONNEC" name="VCONNEC"/>
-                  <Option type="QString" value="WATERWELL" name="WATERWELL"/>
-                  <Option type="QString" value="WATER_CONNECTION" name="WATER_CONNECTION"/>
-                  <Option type="QString" value="WJOIN" name="WJOIN"/>
-                  <Option type="QString" value="WTP" name="WTP"/>
-                  <Option type="QString" value="X" name="X"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="dma1-1d"/>
-                  <Option type="QString" value="2" name="dma1-2d"/>
-                  <Option type="QString" value="3" name="dma2-1d"/>
-                  <Option type="QString" value="4" name="source-1"/>
-                  <Option type="QString" value="5" name="source-2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="macrodma_01"/>
-                  <Option type="QString" value="2" name="macrodma_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="presszone_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26790,10 +26154,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="QString" value="1" name="allow_null"/>
-                <Option type="QString" value="1" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd" name="field_format"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26802,32 +26167,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="QString" value="1" name="allow_null"/>
-                <Option type="QString" value="1" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd" name="field_format"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="work1" name="work1"/>
-                  <Option type="QString" value="work2" name="work2"/>
-                  <Option type="QString" value="work3" name="work3"/>
-                  <Option type="QString" value="work4" name="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -26835,54 +26200,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26891,14 +26230,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="AllowMulti"/>
-                <Option type="QString" value="0" name="AllowNull"/>
-                <Option type="QString" value="" name="FilterExpression"/>
-                <Option type="QString" value="postnumber" name="Key"/>
-                <Option type="QString" value="ext_address20171204171433160" name="Layer"/>
-                <Option type="QString" value="0" name="OrderByValue"/>
-                <Option type="QString" value="0" name="UseCompleter"/>
-                <Option type="QString" value="postnumber" name="Value"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -26907,50 +26250,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26959,8 +26280,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26969,8 +26290,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26979,8 +26300,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26989,8 +26310,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26999,8 +26320,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27009,170 +26330,168 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="TO REVIEW" name="TO REVIEW"/>
-                  <Option type="QString" value="VERIFIED" name="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="sample_id" field="sample_id"/>
-        <alias index="1" name="code" field="code"/>
-        <alias index="2" name="lab_code" field="lab_code"/>
-        <alias index="3" name="feature_id" field="feature_id"/>
-        <alias index="4" name="featurecat_id" field="featurecat_id"/>
-        <alias index="5" name="dma_id" field="dma_id"/>
-        <alias index="6" name="macrodma_id" field="macrodma_id"/>
-        <alias index="7" name="" field="presszone_id"/>
-        <alias index="8" name="state" field="state"/>
-        <alias index="9" name="builtdate" field="builtdate"/>
-        <alias index="10" name="enddate" field="enddate"/>
-        <alias index="11" name="workcat_id" field="workcat_id"/>
-        <alias index="12" name="workcat_id_end" field="workcat_id_end"/>
-        <alias index="13" name="rotation" field="rotation"/>
-        <alias index="14" name="muni_id" field="muni_id"/>
-        <alias index="15" name="streetaxis_id" field="streetaxis_id"/>
-        <alias index="16" name="postnumber" field="postnumber"/>
-        <alias index="17" name="postcode" field="postcode"/>
-        <alias index="18" name="" field="district_id"/>
-        <alias index="19" name="streetaxis2_id" field="streetaxis2_id"/>
-        <alias index="20" name="postnumber2" field="postnumber2"/>
-        <alias index="21" name="postcomplement" field="postcomplement"/>
-        <alias index="22" name="postcomplement2" field="postcomplement2"/>
-        <alias index="23" name="place_name" field="place_name"/>
-        <alias index="24" name="cabinet" field="cabinet"/>
-        <alias index="25" name="observations" field="observations"/>
-        <alias index="26" name="verified" field="verified"/>
-        <alias index="27" name="expl_id" field="expl_id"/>
-        <alias index="28" name="link" field="link"/>
+        <alias field="sample_id" name="sample_id" index="0"/>
+        <alias field="code" name="code" index="1"/>
+        <alias field="lab_code" name="lab_code" index="2"/>
+        <alias field="feature_id" name="feature_id" index="3"/>
+        <alias field="featurecat_id" name="featurecat_id" index="4"/>
+        <alias field="dma_id" name="dma_id" index="5"/>
+        <alias field="macrodma_id" name="macrodma_id" index="6"/>
+        <alias field="presszone_id" name="" index="7"/>
+        <alias field="state" name="state" index="8"/>
+        <alias field="builtdate" name="builtdate" index="9"/>
+        <alias field="enddate" name="enddate" index="10"/>
+        <alias field="workcat_id" name="workcat_id" index="11"/>
+        <alias field="workcat_id_end" name="workcat_id_end" index="12"/>
+        <alias field="rotation" name="rotation" index="13"/>
+        <alias field="muni_id" name="muni_id" index="14"/>
+        <alias field="streetaxis_id" name="streetaxis_id" index="15"/>
+        <alias field="postnumber" name="postnumber" index="16"/>
+        <alias field="postcode" name="postcode" index="17"/>
+        <alias field="district_id" name="" index="18"/>
+        <alias field="streetaxis2_id" name="streetaxis2_id" index="19"/>
+        <alias field="postnumber2" name="postnumber2" index="20"/>
+        <alias field="postcomplement" name="postcomplement" index="21"/>
+        <alias field="postcomplement2" name="postcomplement2" index="22"/>
+        <alias field="place_name" name="place_name" index="23"/>
+        <alias field="cabinet" name="cabinet" index="24"/>
+        <alias field="observations" name="observations" index="25"/>
+        <alias field="verified" name="verified" index="26"/>
+        <alias field="expl_id" name="expl_id" index="27"/>
+        <alias field="link" name="link" index="28"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="sample_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="lab_code" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis2_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="place_name" applyOnUpdate="0"/>
-        <default expression="" field="cabinet" applyOnUpdate="0"/>
-        <default expression="" field="observations" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="sample_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lab_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis2_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="place_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cabinet"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observations"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="sample_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="lab_code"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetaxis2_id"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="place_name"/>
-        <constraint desc="" exp="" field="cabinet"/>
-        <constraint desc="" exp="" field="observations"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -27180,34 +26499,36 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="sample_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="lab_code" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis2_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="place_name" width="-1"/>
-          <column type="field" hidden="0" name="cabinet" width="-1"/>
-          <column type="field" hidden="0" name="observations" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27242,6 +26563,7 @@ def my_form_open(dialog, layer, feature):
         <field name="builtdate" editable="1"/>
         <field name="cabinet" editable="1"/>
         <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
         <field name="dma_id" editable="1"/>
         <field name="enddate" editable="1"/>
         <field name="expl_id" editable="1"/>
@@ -27258,6 +26580,7 @@ def my_form_open(dialog, layer, feature):
         <field name="postcomplement2" editable="1"/>
         <field name="postnumber" editable="1"/>
         <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
         <field name="presszonecat_id" editable="1"/>
         <field name="rotation" editable="1"/>
         <field name="sample_id" editable="1"/>
@@ -27272,12 +26595,14 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -27287,6 +26612,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -27301,7 +26627,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -27356,11 +26682,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -27384,144 +26710,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="sector_id" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category symbol="0" label="0" value="0" render="true"/>
-          <category symbol="1" label="1" value="1" render="true"/>
-          <category symbol="2" label="2" value="2" render="true"/>
-          <category symbol="3" label="3" value="3" render="true"/>
-          <category symbol="4" label="4" value="4" render="true"/>
-          <category symbol="5" label="5" value="5" render="true"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="4">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="5">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27539,22 +26865,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27563,8 +26889,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27573,8 +26899,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27583,8 +26909,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27593,8 +26919,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27603,8 +26929,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27613,8 +26939,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27628,42 +26954,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="sector_id" field="sector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="macrosector_id" field="macrosector_id"/>
-        <alias index="4" name="undelete" field="undelete"/>
-        <alias index="5" name="grafconfig" field="grafconfig"/>
-        <alias index="6" name="" field="stylesheet"/>
+        <alias field="sector_id" name="sector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="macrosector_id" name="macrosector_id" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
+        <alias field="grafconfig" name="grafconfig" index="5"/>
+        <alias field="stylesheet" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -27671,13 +26997,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="172"/>
-          <column type="field" hidden="0" name="descript" width="184"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27728,7 +27054,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -27783,11 +27109,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -27811,33 +27137,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27848,79 +27174,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="postnumber" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="PointGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -27933,22 +27259,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27957,19 +27283,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27978,43 +27303,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28023,8 +27323,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28033,21 +27333,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28055,52 +27352,55 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="muni_id" field="muni_id"/>
-        <alias index="2" name="postcode" field="postcode"/>
-        <alias index="3" name="streetaxis_id" field="streetaxis_id"/>
-        <alias index="4" name="postnumber" field="postnumber"/>
-        <alias index="5" name="plot_id" field="plot_id"/>
-        <alias index="6" name="expl_id" field="expl_id"/>
-        <alias index="7" name="" field="name"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="muni_id" name="muni_id" index="1"/>
+        <alias field="postcode" name="postcode" index="2"/>
+        <alias field="streetaxis_id" name="streetaxis_id" index="3"/>
+        <alias field="postnumber" name="postnumber" index="4"/>
+        <alias field="plot_id" name="plot_id" index="5"/>
+        <alias field="expl_id" name="expl_id" index="6"/>
+        <alias field="name" name="" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="plot_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="plot_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="plot_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -28108,15 +27408,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="plot_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28171,7 +27471,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -28226,11 +27526,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -28254,26 +27554,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28290,34 +27590,34 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -28326,8 +27626,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28336,19 +27636,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28357,43 +27656,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28402,8 +27676,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28412,8 +27686,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28422,8 +27696,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28432,8 +27706,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28442,8 +27716,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28452,83 +27726,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="plot_code" field="plot_code"/>
-        <alias index="2" name="muni_id" field="muni_id"/>
-        <alias index="3" name="postcode" field="postcode"/>
-        <alias index="4" name="streetaxis_id" field="streetaxis_id"/>
-        <alias index="5" name="postnumber" field="postnumber"/>
-        <alias index="6" name="complement" field="complement"/>
-        <alias index="7" name="placement" field="placement"/>
-        <alias index="8" name="square" field="square"/>
-        <alias index="9" name="observ" field="observ"/>
-        <alias index="10" name="text" field="text"/>
-        <alias index="11" name="expl_id" field="expl_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="plot_code" name="plot_code" index="1"/>
+        <alias field="muni_id" name="muni_id" index="2"/>
+        <alias field="postcode" name="postcode" index="3"/>
+        <alias field="streetaxis_id" name="streetaxis_id" index="4"/>
+        <alias field="postnumber" name="postnumber" index="5"/>
+        <alias field="complement" name="complement" index="6"/>
+        <alias field="placement" name="placement" index="7"/>
+        <alias field="square" name="square" index="8"/>
+        <alias field="observ" name="observ" index="9"/>
+        <alias field="text" name="text" index="10"/>
+        <alias field="expl_id" name="expl_id" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="plot_code" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="complement" applyOnUpdate="0"/>
-        <default expression="" field="placement" applyOnUpdate="0"/>
-        <default expression="" field="square" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="plot_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="complement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="placement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="square"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="plot_code"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="complement"/>
-        <constraint desc="" exp="" field="placement"/>
-        <constraint desc="" exp="" field="square"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -28536,19 +27807,19 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="plot_code" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="complement" width="-1"/>
-          <column type="field" hidden="0" name="placement" width="-1"/>
-          <column type="field" hidden="0" name="square" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28611,7 +27882,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="3000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiLineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -28670,7 +27941,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -28694,31 +27965,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="1">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28729,79 +28000,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0.1875" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="name" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0.1875" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="LineGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="9" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="0.6" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -28814,22 +28085,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -28838,8 +28109,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28848,19 +28119,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28869,8 +28139,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28879,32 +28149,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28913,54 +28179,54 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="code" field="code"/>
-        <alias index="2" name="type" field="type"/>
-        <alias index="3" name="name" field="name"/>
-        <alias index="4" name="text" field="text"/>
-        <alias index="5" name="expl_id" field="expl_id"/>
-        <alias index="6" name="muni_id" field="muni_id"/>
-        <alias index="7" name="descript" field="descript"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="code" name="code" index="1"/>
+        <alias field="type" name="type" index="2"/>
+        <alias field="name" name="name" index="3"/>
+        <alias field="text" name="text" index="4"/>
+        <alias field="expl_id" name="expl_id" index="5"/>
+        <alias field="muni_id" name="muni_id" index="6"/>
+        <alias field="descript" name="descript" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -28968,15 +28234,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="type" width="-1"/>
-          <column type="field" hidden="0" name="name" width="269"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29031,7 +28297,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -29084,7 +28356,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -29108,26 +28380,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29145,22 +28417,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29169,8 +28441,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29179,8 +28451,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29189,8 +28461,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29199,8 +28471,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29209,8 +28481,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29219,46 +28491,46 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="minsector_id" field="minsector_id"/>
-        <alias index="1" name="dma_id" field="dma_id"/>
-        <alias index="2" name="dqa_id" field="dqa_id"/>
-        <alias index="3" name="presszonecat_id" field="presszonecat_id"/>
-        <alias index="4" name="sector_id" field="sector_id"/>
-        <alias index="5" name="expl_id" field="expl_id"/>
+        <alias field="minsector_id" name="minsector_id" index="0"/>
+        <alias field="dma_id" name="dma_id" index="1"/>
+        <alias field="dqa_id" name="dqa_id" index="2"/>
+        <alias field="presszonecat_id" name="presszonecat_id" index="3"/>
+        <alias field="sector_id" name="sector_id" index="4"/>
+        <alias field="expl_id" name="expl_id" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="presszonecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszonecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="presszonecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -29266,13 +28538,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29323,7 +28595,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="0" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Line" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
       <keywordList>
@@ -29376,7 +28654,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -29400,56 +28678,56 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="76,38,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.7"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="76,38,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.7" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="255,206,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="255,206,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29466,22 +28744,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29516,30 +28794,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="arc_id"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="arc_id" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="arc_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -29547,11 +28825,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29598,7 +28876,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
       <keywordList>
@@ -29651,7 +28935,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -29675,33 +28959,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="45,84,255,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="0,24,124,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.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="45,84,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,24,124,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29718,22 +29002,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29985,154 +29269,154 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="work_order"/>
-        <alias index="2" name="" field="state"/>
-        <alias index="3" name="" field="class"/>
-        <alias index="4" name="" field="mincut_type"/>
-        <alias index="5" name="" field="received_date"/>
-        <alias index="6" name="" field="expl_id"/>
-        <alias index="7" name="" field="expl_name"/>
-        <alias index="8" name="" field="macroexpl_name"/>
-        <alias index="9" name="" field="macroexpl_id"/>
-        <alias index="10" name="" field="muni_id"/>
-        <alias index="11" name="" field="muni_name"/>
-        <alias index="12" name="" field="postcode"/>
-        <alias index="13" name="" field="streetaxis_id"/>
-        <alias index="14" name="" field="street_name"/>
-        <alias index="15" name="" field="postnumber"/>
-        <alias index="16" name="" field="anl_cause"/>
-        <alias index="17" name="" field="anl_tstamp"/>
-        <alias index="18" name="" field="anl_user"/>
-        <alias index="19" name="" field="anl_descript"/>
-        <alias index="20" name="" field="anl_feature_id"/>
-        <alias index="21" name="" field="anl_feature_type"/>
-        <alias index="22" name="" field="forecast_start"/>
-        <alias index="23" name="" field="forecast_end"/>
-        <alias index="24" name="" field="assigned_to"/>
-        <alias index="25" name="" field="exec_start"/>
-        <alias index="26" name="" field="exec_end"/>
-        <alias index="27" name="" field="exec_user"/>
-        <alias index="28" name="" field="exec_descript"/>
-        <alias index="29" name="" field="exec_the_geom"/>
-        <alias index="30" name="" field="exec_from_plot"/>
-        <alias index="31" name="" field="exec_depth"/>
-        <alias index="32" name="" field="exec_appropiate"/>
-        <alias index="33" name="" field="notified"/>
-        <alias index="34" name="" field="output"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="work_order" name="" index="1"/>
+        <alias field="state" name="" index="2"/>
+        <alias field="class" name="" index="3"/>
+        <alias field="mincut_type" name="" index="4"/>
+        <alias field="received_date" name="" index="5"/>
+        <alias field="expl_id" name="" index="6"/>
+        <alias field="expl_name" name="" index="7"/>
+        <alias field="macroexpl_name" name="" index="8"/>
+        <alias field="macroexpl_id" name="" index="9"/>
+        <alias field="muni_id" name="" index="10"/>
+        <alias field="muni_name" name="" index="11"/>
+        <alias field="postcode" name="" index="12"/>
+        <alias field="streetaxis_id" name="" index="13"/>
+        <alias field="street_name" name="" index="14"/>
+        <alias field="postnumber" name="" index="15"/>
+        <alias field="anl_cause" name="" index="16"/>
+        <alias field="anl_tstamp" name="" index="17"/>
+        <alias field="anl_user" name="" index="18"/>
+        <alias field="anl_descript" name="" index="19"/>
+        <alias field="anl_feature_id" name="" index="20"/>
+        <alias field="anl_feature_type" name="" index="21"/>
+        <alias field="forecast_start" name="" index="22"/>
+        <alias field="forecast_end" name="" index="23"/>
+        <alias field="assigned_to" name="" index="24"/>
+        <alias field="exec_start" name="" index="25"/>
+        <alias field="exec_end" name="" index="26"/>
+        <alias field="exec_user" name="" index="27"/>
+        <alias field="exec_descript" name="" index="28"/>
+        <alias field="exec_the_geom" name="" index="29"/>
+        <alias field="exec_from_plot" name="" index="30"/>
+        <alias field="exec_depth" name="" index="31"/>
+        <alias field="exec_appropiate" name="" index="32"/>
+        <alias field="notified" name="" index="33"/>
+        <alias field="output" name="" index="34"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="class" applyOnUpdate="0"/>
-        <default expression="" field="mincut_type" applyOnUpdate="0"/>
-        <default expression="" field="received_date" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_name" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_name" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_name" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="street_name" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="anl_cause" applyOnUpdate="0"/>
-        <default expression="" field="anl_tstamp" applyOnUpdate="0"/>
-        <default expression="" field="anl_user" applyOnUpdate="0"/>
-        <default expression="" field="anl_descript" applyOnUpdate="0"/>
-        <default expression="" field="anl_feature_id" applyOnUpdate="0"/>
-        <default expression="" field="anl_feature_type" applyOnUpdate="0"/>
-        <default expression="" field="forecast_start" applyOnUpdate="0"/>
-        <default expression="" field="forecast_end" applyOnUpdate="0"/>
-        <default expression="" field="assigned_to" applyOnUpdate="0"/>
-        <default expression="" field="exec_start" applyOnUpdate="0"/>
-        <default expression="" field="exec_end" applyOnUpdate="0"/>
-        <default expression="" field="exec_user" applyOnUpdate="0"/>
-        <default expression="" field="exec_descript" applyOnUpdate="0"/>
-        <default expression="" field="exec_the_geom" applyOnUpdate="0"/>
-        <default expression="" field="exec_from_plot" applyOnUpdate="0"/>
-        <default expression="" field="exec_depth" applyOnUpdate="0"/>
-        <default expression="" field="exec_appropiate" applyOnUpdate="0"/>
-        <default expression="" field="notified" applyOnUpdate="0"/>
-        <default expression="" field="output" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="mincut_type" expression=""/>
+        <default applyOnUpdate="0" field="received_date" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_name" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="street_name" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="anl_cause" expression=""/>
+        <default applyOnUpdate="0" field="anl_tstamp" expression=""/>
+        <default applyOnUpdate="0" field="anl_user" expression=""/>
+        <default applyOnUpdate="0" field="anl_descript" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_id" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_type" expression=""/>
+        <default applyOnUpdate="0" field="forecast_start" expression=""/>
+        <default applyOnUpdate="0" field="forecast_end" expression=""/>
+        <default applyOnUpdate="0" field="assigned_to" expression=""/>
+        <default applyOnUpdate="0" field="exec_start" expression=""/>
+        <default applyOnUpdate="0" field="exec_end" expression=""/>
+        <default applyOnUpdate="0" field="exec_user" expression=""/>
+        <default applyOnUpdate="0" field="exec_descript" expression=""/>
+        <default applyOnUpdate="0" field="exec_the_geom" expression=""/>
+        <default applyOnUpdate="0" field="exec_from_plot" expression=""/>
+        <default applyOnUpdate="0" field="exec_depth" expression=""/>
+        <default applyOnUpdate="0" field="exec_appropiate" expression=""/>
+        <default applyOnUpdate="0" field="notified" expression=""/>
+        <default applyOnUpdate="0" field="output" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="class"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="mincut_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="received_date"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="street_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_cause"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_feature_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="forecast_start"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="forecast_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="assigned_to"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_start"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_the_geom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_from_plot"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_appropiate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="notified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="output"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mincut_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="received_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="street_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_cause" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="assigned_to" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_the_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_from_plot" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_appropiate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="notified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="output" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="class"/>
-        <constraint desc="" exp="" field="mincut_type"/>
-        <constraint desc="" exp="" field="received_date"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="expl_name"/>
-        <constraint desc="" exp="" field="macroexpl_name"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="muni_name"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="street_name"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="anl_cause"/>
-        <constraint desc="" exp="" field="anl_tstamp"/>
-        <constraint desc="" exp="" field="anl_user"/>
-        <constraint desc="" exp="" field="anl_descript"/>
-        <constraint desc="" exp="" field="anl_feature_id"/>
-        <constraint desc="" exp="" field="anl_feature_type"/>
-        <constraint desc="" exp="" field="forecast_start"/>
-        <constraint desc="" exp="" field="forecast_end"/>
-        <constraint desc="" exp="" field="assigned_to"/>
-        <constraint desc="" exp="" field="exec_start"/>
-        <constraint desc="" exp="" field="exec_end"/>
-        <constraint desc="" exp="" field="exec_user"/>
-        <constraint desc="" exp="" field="exec_descript"/>
-        <constraint desc="" exp="" field="exec_the_geom"/>
-        <constraint desc="" exp="" field="exec_from_plot"/>
-        <constraint desc="" exp="" field="exec_depth"/>
-        <constraint desc="" exp="" field="exec_appropiate"/>
-        <constraint desc="" exp="" field="notified"/>
-        <constraint desc="" exp="" field="output"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="mincut_type" desc=""/>
+        <constraint exp="" field="received_date" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="expl_name" desc=""/>
+        <constraint exp="" field="macroexpl_name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="muni_name" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="street_name" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="anl_cause" desc=""/>
+        <constraint exp="" field="anl_tstamp" desc=""/>
+        <constraint exp="" field="anl_user" desc=""/>
+        <constraint exp="" field="anl_descript" desc=""/>
+        <constraint exp="" field="anl_feature_id" desc=""/>
+        <constraint exp="" field="anl_feature_type" desc=""/>
+        <constraint exp="" field="forecast_start" desc=""/>
+        <constraint exp="" field="forecast_end" desc=""/>
+        <constraint exp="" field="assigned_to" desc=""/>
+        <constraint exp="" field="exec_start" desc=""/>
+        <constraint exp="" field="exec_end" desc=""/>
+        <constraint exp="" field="exec_user" desc=""/>
+        <constraint exp="" field="exec_descript" desc=""/>
+        <constraint exp="" field="exec_the_geom" desc=""/>
+        <constraint exp="" field="exec_from_plot" desc=""/>
+        <constraint exp="" field="exec_depth" desc=""/>
+        <constraint exp="" field="exec_appropiate" desc=""/>
+        <constraint exp="" field="notified" desc=""/>
+        <constraint exp="" field="output" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -30140,42 +29424,42 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="class" width="-1"/>
-          <column type="field" hidden="0" name="mincut_type" width="-1"/>
-          <column type="field" hidden="0" name="received_date" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_name" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_name" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_name" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="street_name" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="anl_cause" width="-1"/>
-          <column type="field" hidden="0" name="anl_tstamp" width="-1"/>
-          <column type="field" hidden="0" name="anl_user" width="-1"/>
-          <column type="field" hidden="0" name="anl_descript" width="-1"/>
-          <column type="field" hidden="0" name="anl_feature_id" width="-1"/>
-          <column type="field" hidden="0" name="anl_feature_type" width="-1"/>
-          <column type="field" hidden="0" name="forecast_start" width="-1"/>
-          <column type="field" hidden="0" name="forecast_end" width="-1"/>
-          <column type="field" hidden="0" name="assigned_to" width="-1"/>
-          <column type="field" hidden="0" name="exec_start" width="-1"/>
-          <column type="field" hidden="0" name="exec_end" width="-1"/>
-          <column type="field" hidden="0" name="exec_user" width="-1"/>
-          <column type="field" hidden="0" name="exec_descript" width="-1"/>
-          <column type="field" hidden="0" name="exec_the_geom" width="-1"/>
-          <column type="field" hidden="0" name="exec_from_plot" width="-1"/>
-          <column type="field" hidden="0" name="exec_depth" width="-1"/>
-          <column type="field" hidden="0" name="exec_appropiate" width="-1"/>
-          <column type="field" hidden="0" name="notified" width="-1"/>
-          <column type="field" hidden="0" name="output" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="mincut_type"/>
+          <column type="field" width="-1" hidden="0" name="received_date"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_name"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="street_name"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="anl_cause"/>
+          <column type="field" width="-1" hidden="0" name="anl_tstamp"/>
+          <column type="field" width="-1" hidden="0" name="anl_user"/>
+          <column type="field" width="-1" hidden="0" name="anl_descript"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_id"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_type"/>
+          <column type="field" width="-1" hidden="0" name="forecast_start"/>
+          <column type="field" width="-1" hidden="0" name="forecast_end"/>
+          <column type="field" width="-1" hidden="0" name="assigned_to"/>
+          <column type="field" width="-1" hidden="0" name="exec_start"/>
+          <column type="field" width="-1" hidden="0" name="exec_end"/>
+          <column type="field" width="-1" hidden="0" name="exec_user"/>
+          <column type="field" width="-1" hidden="0" name="exec_descript"/>
+          <column type="field" width="-1" hidden="0" name="exec_the_geom"/>
+          <column type="field" width="-1" hidden="0" name="exec_from_plot"/>
+          <column type="field" width="-1" hidden="0" name="exec_depth"/>
+          <column type="field" width="-1" hidden="0" name="exec_appropiate"/>
+          <column type="field" width="-1" hidden="0" name="notified"/>
+          <column type="field" width="-1" hidden="0" name="output"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30284,7 +29568,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>expl_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
       <keywordList>
@@ -30337,7 +29627,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30361,33 +29651,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="176,123,103,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="102,46,25,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="176,123,103,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="102,46,25,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30404,22 +29694,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30461,34 +29751,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="connec_id"/>
-        <alias index="4" name="" field="customer_code"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="connec_id" name="" index="3"/>
+        <alias field="customer_code" name="" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -30496,12 +29786,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30550,7 +29840,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -30603,7 +29899,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30627,33 +29923,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="241,209,66,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="160,134,17,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="241,209,66,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="160,134,17,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30670,22 +29966,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30720,30 +30016,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="node_id"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="node_id" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="node_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -30751,11 +30047,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30802,7 +30098,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
       <keywordList>
@@ -30855,7 +30157,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30879,97 +30181,97 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="proposed" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="proposed" symbollevels="0">
         <categories>
-          <category symbol="0" label="Proposed to close" value="true" render="true"/>
-          <category symbol="1" label="Do not operate" value="false" render="true"/>
+          <category render="true" value="true" label="Proposed to close" symbol="0"/>
+          <category render="true" value="false" label="Do not operate" symbol="1"/>
         </categories>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,55,58,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="134,13,13,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,55,58,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="134,13,13,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="51,160,44,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="6,94,0,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="51,160,44,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="6,94,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="232,113,141,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="232,113,141,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30986,22 +30288,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31064,46 +30366,46 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="node_id"/>
-        <alias index="4" name="" field="closed"/>
-        <alias index="5" name="" field="broken"/>
-        <alias index="6" name="" field="unaccess"/>
-        <alias index="7" name="" field="proposed"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="node_id" name="" index="3"/>
+        <alias field="closed" name="" index="4"/>
+        <alias field="broken" name="" index="5"/>
+        <alias field="unaccess" name="" index="6"/>
+        <alias field="proposed" name="" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="unaccess" applyOnUpdate="0"/>
-        <default expression="" field="proposed" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="unaccess" expression=""/>
+        <default applyOnUpdate="0" field="proposed" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="unaccess"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="proposed"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="unaccess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="proposed" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="unaccess"/>
-        <constraint desc="" exp="" field="proposed"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="unaccess" desc=""/>
+        <constraint exp="" field="proposed" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -31111,15 +30413,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="unaccess" width="-1"/>
-          <column type="field" hidden="0" name="proposed" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="unaccess"/>
+          <column type="field" width="-1" hidden="0" name="proposed"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31174,7 +30476,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="100000" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_current_psector" (the_geom) sql=</datasource>
       <keywordList>
@@ -31201,6 +30503,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -31217,7 +30528,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
       <vectorjoins/>
@@ -31234,26 +30553,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="227,92,92,37"/>
-              <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="197,167,227,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.75"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="227,92,92,37" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="197,167,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.75" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31264,61 +30583,85 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="231,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="name" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="10" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="231,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="10" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="133,182,111,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
-                  </Option>
-                </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PolygonGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;rotation&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -31336,287 +30679,356 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="psector_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="psector_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="psector_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_type">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="descript">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="priority">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_arc">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_node">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_other">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="rotation">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="scale">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pem">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="gexpenses">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pec">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pec_vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="other">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pca">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="psector_id" field="psector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="psector_type" field="psector_type"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="priority" field="priority"/>
-        <alias index="5" name="total_arc" field="total_arc"/>
-        <alias index="6" name="total_node" field="total_node"/>
-        <alias index="7" name="total_other" field="total_other"/>
-        <alias index="8" name="text1" field="text1"/>
-        <alias index="9" name="text2" field="text2"/>
-        <alias index="10" name="observ" field="observ"/>
-        <alias index="11" name="rotation" field="rotation"/>
-        <alias index="12" name="scale" field="scale"/>
-        <alias index="13" name="sector_id" field="sector_id"/>
-        <alias index="14" name="active" field="active"/>
-        <alias index="15" name="pem" field="pem"/>
-        <alias index="16" name="gexpenses" field="gexpenses"/>
-        <alias index="17" name="pec" field="pec"/>
-        <alias index="18" name="vat" field="vat"/>
-        <alias index="19" name="pec_vat" field="pec_vat"/>
-        <alias index="20" name="other" field="other"/>
-        <alias index="21" name="pca" field="pca"/>
+        <alias field="psector_id" name="psector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="psector_type" name="psector_type" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="priority" name="priority" index="4"/>
+        <alias field="total_arc" name="total_arc" index="5"/>
+        <alias field="total_node" name="total_node" index="6"/>
+        <alias field="total_other" name="total_other" index="7"/>
+        <alias field="text1" name="text1" index="8"/>
+        <alias field="text2" name="text2" index="9"/>
+        <alias field="observ" name="observ" index="10"/>
+        <alias field="rotation" name="rotation" index="11"/>
+        <alias field="scale" name="scale" index="12"/>
+        <alias field="sector_id" name="sector_id" index="13"/>
+        <alias field="active" name="active" index="14"/>
+        <alias field="pem" name="pem" index="15"/>
+        <alias field="gexpenses" name="gexpenses" index="16"/>
+        <alias field="pec" name="pec" index="17"/>
+        <alias field="vat" name="vat" index="18"/>
+        <alias field="pec_vat" name="pec_vat" index="19"/>
+        <alias field="other" name="other" index="20"/>
+        <alias field="pca" name="pca" index="21"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="psector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="psector_type" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="priority" applyOnUpdate="0"/>
-        <default expression="" field="total_arc" applyOnUpdate="0"/>
-        <default expression="" field="total_node" applyOnUpdate="0"/>
-        <default expression="" field="total_other" applyOnUpdate="0"/>
-        <default expression="" field="text1" applyOnUpdate="0"/>
-        <default expression="" field="text2" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="scale" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="pem" applyOnUpdate="0"/>
-        <default expression="" field="gexpenses" applyOnUpdate="0"/>
-        <default expression="" field="pec" applyOnUpdate="0"/>
-        <default expression="" field="vat" applyOnUpdate="0"/>
-        <default expression="" field="pec_vat" applyOnUpdate="0"/>
-        <default expression="" field="other" applyOnUpdate="0"/>
-        <default expression="" field="pca" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="psector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="psector_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="priority" expression=""/>
+        <default applyOnUpdate="0" field="total_arc" expression=""/>
+        <default applyOnUpdate="0" field="total_node" expression=""/>
+        <default applyOnUpdate="0" field="total_other" expression=""/>
+        <default applyOnUpdate="0" field="text1" expression=""/>
+        <default applyOnUpdate="0" field="text2" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="scale" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="pem" expression=""/>
+        <default applyOnUpdate="0" field="gexpenses" expression=""/>
+        <default applyOnUpdate="0" field="pec" expression=""/>
+        <default applyOnUpdate="0" field="vat" expression=""/>
+        <default applyOnUpdate="0" field="pec_vat" expression=""/>
+        <default applyOnUpdate="0" field="other" expression=""/>
+        <default applyOnUpdate="0" field="pca" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="psector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="psector_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="priority"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_node"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_other"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="scale"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pem"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gexpenses"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vat"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pec_vat"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pca"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="psector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="priority" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_node" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="scale" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pem" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gexpenses" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pec_vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pca" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="psector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="psector_type"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="priority"/>
-        <constraint desc="" exp="" field="total_arc"/>
-        <constraint desc="" exp="" field="total_node"/>
-        <constraint desc="" exp="" field="total_other"/>
-        <constraint desc="" exp="" field="text1"/>
-        <constraint desc="" exp="" field="text2"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="scale"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="pem"/>
-        <constraint desc="" exp="" field="gexpenses"/>
-        <constraint desc="" exp="" field="pec"/>
-        <constraint desc="" exp="" field="vat"/>
-        <constraint desc="" exp="" field="pec_vat"/>
-        <constraint desc="" exp="" field="other"/>
-        <constraint desc="" exp="" field="pca"/>
+        <constraint exp="" field="psector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="psector_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="priority" desc=""/>
+        <constraint exp="" field="total_arc" desc=""/>
+        <constraint exp="" field="total_node" desc=""/>
+        <constraint exp="" field="total_other" desc=""/>
+        <constraint exp="" field="text1" desc=""/>
+        <constraint exp="" field="text2" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="scale" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="pem" desc=""/>
+        <constraint exp="" field="gexpenses" desc=""/>
+        <constraint exp="" field="pec" desc=""/>
+        <constraint exp="" field="vat" desc=""/>
+        <constraint exp="" field="pec_vat" desc=""/>
+        <constraint exp="" field="other" desc=""/>
+        <constraint exp="" field="pca" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -31624,32 +31036,29 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="psector_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="206"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="priority" width="133"/>
-          <column type="field" hidden="0" name="text1" width="-1"/>
-          <column type="field" hidden="0" name="text2" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="234"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="scale" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="gexpenses" width="-1"/>
-          <column type="field" hidden="0" name="vat" width="-1"/>
-          <column type="field" hidden="0" name="other" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="psector_type" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="field" hidden="0" name="total_arc" width="-1"/>
-          <column type="field" hidden="0" name="total_node" width="-1"/>
-          <column type="field" hidden="0" name="total_other" width="-1"/>
-          <column type="field" hidden="0" name="pem" width="-1"/>
-          <column type="field" hidden="0" name="pec" width="-1"/>
-          <column type="field" hidden="0" name="pec_vat" width="-1"/>
-          <column type="field" hidden="0" name="pca" width="-1"/>
-          <column type="field" hidden="0" name="affec_length" width="-1"/>
-          <column type="field" hidden="0" name="plan_length" width="-1"/>
-          <column type="field" hidden="0" name="current_length" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="psector_id"/>
+          <column type="field" width="206" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="133" hidden="0" name="priority"/>
+          <column type="field" width="-1" hidden="0" name="text1"/>
+          <column type="field" width="-1" hidden="0" name="text2"/>
+          <column type="field" width="234" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="scale"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="gexpenses"/>
+          <column type="field" width="-1" hidden="0" name="vat"/>
+          <column type="field" width="-1" hidden="0" name="other"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="psector_type"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="total_arc"/>
+          <column type="field" width="-1" hidden="0" name="total_node"/>
+          <column type="field" width="-1" hidden="0" name="total_other"/>
+          <column type="field" width="-1" hidden="0" name="pem"/>
+          <column type="field" width="-1" hidden="0" name="pec"/>
+          <column type="field" width="-1" hidden="0" name="pec_vat"/>
+          <column type="field" width="-1" hidden="0" name="pca"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31738,7 +31147,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -31793,11 +31202,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -31821,31 +31230,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="235,163,126,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="235,163,126,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31862,22 +31271,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31886,8 +31295,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31896,8 +31305,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31906,8 +31315,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31916,8 +31325,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31926,8 +31335,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31936,50 +31345,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31988,8 +31385,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -31998,23 +31395,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32022,23 +31425,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="z1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="z2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32046,16 +31455,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="width">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32063,8 +31475,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32073,8 +31485,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32083,8 +31495,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32093,23 +31505,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_param">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_y">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32117,8 +31535,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32127,8 +31545,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32137,8 +31555,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32147,8 +31565,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32157,8 +31575,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32167,8 +31585,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32177,8 +31595,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32187,8 +31605,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32197,8 +31615,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32207,8 +31625,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32217,8 +31635,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32227,8 +31645,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32237,8 +31655,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32247,8 +31665,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32257,8 +31675,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32267,8 +31685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32277,8 +31695,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32287,8 +31705,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32297,8 +31715,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32307,16 +31725,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="trenchl_cost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32324,8 +31745,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32334,8 +31755,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32344,8 +31765,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32354,8 +31775,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32364,8 +31785,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32374,8 +31795,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32384,351 +31805,387 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="other_budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtcost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtdate">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="age">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="aperiod">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="arate">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="amortized">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pending">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="arc_id" field="arc_id"/>
-        <alias index="1" name="node_1" field="node_1"/>
-        <alias index="2" name="node_2" field="node_2"/>
-        <alias index="3" name="arc_type" field="arc_type"/>
-        <alias index="4" name="arccat_id" field="arccat_id"/>
-        <alias index="5" name="epa_type" field="epa_type"/>
-        <alias index="6" name="sector_id" field="sector_id"/>
-        <alias index="7" name="expl_id" field="expl_id"/>
-        <alias index="8" name="state" field="state"/>
-        <alias index="9" name="annotation" field="annotation"/>
-        <alias index="10" name="soilcat_id" field="soilcat_id"/>
-        <alias index="11" name="y1" field="y1"/>
-        <alias index="12" name="y2" field="y2"/>
-        <alias index="13" name="mean_y" field="mean_y"/>
-        <alias index="14" name="z1" field="z1"/>
-        <alias index="15" name="z2" field="z2"/>
-        <alias index="16" name="thickness" field="thickness"/>
-        <alias index="17" name="width" field="width"/>
-        <alias index="18" name="b" field="b"/>
-        <alias index="19" name="bulk" field="bulk"/>
-        <alias index="20" name="geom1" field="geom1"/>
-        <alias index="21" name="area" field="area"/>
-        <alias index="22" name="y_param" field="y_param"/>
-        <alias index="23" name="total_y" field="total_y"/>
-        <alias index="24" name="rec_y" field="rec_y"/>
-        <alias index="25" name="geom1_ext" field="geom1_ext"/>
-        <alias index="26" name="calculed_y" field="calculed_y"/>
-        <alias index="27" name="m3mlexc" field="m3mlexc"/>
-        <alias index="28" name="m2mltrenchl" field="m2mltrenchl"/>
-        <alias index="29" name="m2mlbottom" field="m2mlbottom"/>
-        <alias index="30" name="m2mlpav" field="m2mlpav"/>
-        <alias index="31" name="m3mlprotec" field="m3mlprotec"/>
-        <alias index="32" name="m3mlfill" field="m3mlfill"/>
-        <alias index="33" name="m3mlexcess" field="m3mlexcess"/>
-        <alias index="34" name="m3exc_cost" field="m3exc_cost"/>
-        <alias index="35" name="m2trenchl_cost" field="m2trenchl_cost"/>
-        <alias index="36" name="m2bottom_cost" field="m2bottom_cost"/>
-        <alias index="37" name="m2pav_cost" field="m2pav_cost"/>
-        <alias index="38" name="m3protec_cost" field="m3protec_cost"/>
-        <alias index="39" name="m3fill_cost" field="m3fill_cost"/>
-        <alias index="40" name="m3excess_cost" field="m3excess_cost"/>
-        <alias index="41" name="cost_unit" field="cost_unit"/>
-        <alias index="42" name="pav_cost" field="pav_cost"/>
-        <alias index="43" name="exc_cost" field="exc_cost"/>
-        <alias index="44" name="trenchl_cost" field="trenchl_cost"/>
-        <alias index="45" name="base_cost" field="base_cost"/>
-        <alias index="46" name="protec_cost" field="protec_cost"/>
-        <alias index="47" name="fill_cost" field="fill_cost"/>
-        <alias index="48" name="excess_cost" field="excess_cost"/>
-        <alias index="49" name="arc_cost" field="arc_cost"/>
-        <alias index="50" name="cost" field="cost"/>
-        <alias index="51" name="length" field="length"/>
-        <alias index="52" name="budget" field="budget"/>
-        <alias index="53" name="other_budget" field="other_budget"/>
-        <alias index="54" name="total_budget" field="total_budget"/>
-        <alias index="55" name="" field="builtcost"/>
-        <alias index="56" name="" field="builtdate"/>
-        <alias index="57" name="" field="age"/>
-        <alias index="58" name="" field="acoeff"/>
-        <alias index="59" name="" field="aperiod"/>
-        <alias index="60" name="" field="arate"/>
-        <alias index="61" name="" field="amortized"/>
-        <alias index="62" name="" field="pending"/>
+        <alias field="arc_id" name="arc_id" index="0"/>
+        <alias field="node_1" name="node_1" index="1"/>
+        <alias field="node_2" name="node_2" index="2"/>
+        <alias field="arc_type" name="arc_type" index="3"/>
+        <alias field="arccat_id" name="arccat_id" index="4"/>
+        <alias field="epa_type" name="epa_type" index="5"/>
+        <alias field="sector_id" name="sector_id" index="6"/>
+        <alias field="expl_id" name="expl_id" index="7"/>
+        <alias field="state" name="state" index="8"/>
+        <alias field="annotation" name="annotation" index="9"/>
+        <alias field="soilcat_id" name="soilcat_id" index="10"/>
+        <alias field="y1" name="y1" index="11"/>
+        <alias field="y2" name="y2" index="12"/>
+        <alias field="mean_y" name="mean_y" index="13"/>
+        <alias field="z1" name="z1" index="14"/>
+        <alias field="z2" name="z2" index="15"/>
+        <alias field="thickness" name="thickness" index="16"/>
+        <alias field="width" name="width" index="17"/>
+        <alias field="b" name="b" index="18"/>
+        <alias field="bulk" name="bulk" index="19"/>
+        <alias field="geom1" name="geom1" index="20"/>
+        <alias field="area" name="area" index="21"/>
+        <alias field="y_param" name="y_param" index="22"/>
+        <alias field="total_y" name="total_y" index="23"/>
+        <alias field="rec_y" name="rec_y" index="24"/>
+        <alias field="geom1_ext" name="geom1_ext" index="25"/>
+        <alias field="calculed_y" name="calculed_y" index="26"/>
+        <alias field="m3mlexc" name="m3mlexc" index="27"/>
+        <alias field="m2mltrenchl" name="m2mltrenchl" index="28"/>
+        <alias field="m2mlbottom" name="m2mlbottom" index="29"/>
+        <alias field="m2mlpav" name="m2mlpav" index="30"/>
+        <alias field="m3mlprotec" name="m3mlprotec" index="31"/>
+        <alias field="m3mlfill" name="m3mlfill" index="32"/>
+        <alias field="m3mlexcess" name="m3mlexcess" index="33"/>
+        <alias field="m3exc_cost" name="m3exc_cost" index="34"/>
+        <alias field="m2trenchl_cost" name="m2trenchl_cost" index="35"/>
+        <alias field="m2bottom_cost" name="m2bottom_cost" index="36"/>
+        <alias field="m2pav_cost" name="m2pav_cost" index="37"/>
+        <alias field="m3protec_cost" name="m3protec_cost" index="38"/>
+        <alias field="m3fill_cost" name="m3fill_cost" index="39"/>
+        <alias field="m3excess_cost" name="m3excess_cost" index="40"/>
+        <alias field="cost_unit" name="cost_unit" index="41"/>
+        <alias field="pav_cost" name="pav_cost" index="42"/>
+        <alias field="exc_cost" name="exc_cost" index="43"/>
+        <alias field="trenchl_cost" name="trenchl_cost" index="44"/>
+        <alias field="base_cost" name="base_cost" index="45"/>
+        <alias field="protec_cost" name="protec_cost" index="46"/>
+        <alias field="fill_cost" name="fill_cost" index="47"/>
+        <alias field="excess_cost" name="excess_cost" index="48"/>
+        <alias field="arc_cost" name="arc_cost" index="49"/>
+        <alias field="cost" name="cost" index="50"/>
+        <alias field="length" name="length" index="51"/>
+        <alias field="budget" name="budget" index="52"/>
+        <alias field="other_budget" name="other_budget" index="53"/>
+        <alias field="total_budget" name="total_budget" index="54"/>
+        <alias field="builtcost" name="" index="55"/>
+        <alias field="builtdate" name="" index="56"/>
+        <alias field="age" name="" index="57"/>
+        <alias field="acoeff" name="" index="58"/>
+        <alias field="aperiod" name="" index="59"/>
+        <alias field="arate" name="" index="60"/>
+        <alias field="amortized" name="" index="61"/>
+        <alias field="pending" name="" index="62"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="y1" applyOnUpdate="0"/>
-        <default expression="" field="y2" applyOnUpdate="0"/>
-        <default expression="" field="mean_y" applyOnUpdate="0"/>
-        <default expression="" field="z1" applyOnUpdate="0"/>
-        <default expression="" field="z2" applyOnUpdate="0"/>
-        <default expression="" field="thickness" applyOnUpdate="0"/>
-        <default expression="" field="width" applyOnUpdate="0"/>
-        <default expression="" field="b" applyOnUpdate="0"/>
-        <default expression="" field="bulk" applyOnUpdate="0"/>
-        <default expression="" field="geom1" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="y_param" applyOnUpdate="0"/>
-        <default expression="" field="total_y" applyOnUpdate="0"/>
-        <default expression="" field="rec_y" applyOnUpdate="0"/>
-        <default expression="" field="geom1_ext" applyOnUpdate="0"/>
-        <default expression="" field="calculed_y" applyOnUpdate="0"/>
-        <default expression="" field="m3mlexc" applyOnUpdate="0"/>
-        <default expression="" field="m2mltrenchl" applyOnUpdate="0"/>
-        <default expression="" field="m2mlbottom" applyOnUpdate="0"/>
-        <default expression="" field="m2mlpav" applyOnUpdate="0"/>
-        <default expression="" field="m3mlprotec" applyOnUpdate="0"/>
-        <default expression="" field="m3mlfill" applyOnUpdate="0"/>
-        <default expression="" field="m3mlexcess" applyOnUpdate="0"/>
-        <default expression="" field="m3exc_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2trenchl_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2bottom_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2pav_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3protec_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3fill_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3excess_cost" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="pav_cost" applyOnUpdate="0"/>
-        <default expression="" field="exc_cost" applyOnUpdate="0"/>
-        <default expression="" field="trenchl_cost" applyOnUpdate="0"/>
-        <default expression="" field="base_cost" applyOnUpdate="0"/>
-        <default expression="" field="protec_cost" applyOnUpdate="0"/>
-        <default expression="" field="fill_cost" applyOnUpdate="0"/>
-        <default expression="" field="excess_cost" applyOnUpdate="0"/>
-        <default expression="" field="arc_cost" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="length" applyOnUpdate="0"/>
-        <default expression="" field="budget" applyOnUpdate="0"/>
-        <default expression="" field="other_budget" applyOnUpdate="0"/>
-        <default expression="" field="total_budget" applyOnUpdate="0"/>
-        <default expression="" field="builtcost" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="age" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
-        <default expression="" field="aperiod" applyOnUpdate="0"/>
-        <default expression="" field="arate" applyOnUpdate="0"/>
-        <default expression="" field="amortized" applyOnUpdate="0"/>
-        <default expression="" field="pending" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="y1" expression=""/>
+        <default applyOnUpdate="0" field="y2" expression=""/>
+        <default applyOnUpdate="0" field="mean_y" expression=""/>
+        <default applyOnUpdate="0" field="z1" expression=""/>
+        <default applyOnUpdate="0" field="z2" expression=""/>
+        <default applyOnUpdate="0" field="thickness" expression=""/>
+        <default applyOnUpdate="0" field="width" expression=""/>
+        <default applyOnUpdate="0" field="b" expression=""/>
+        <default applyOnUpdate="0" field="bulk" expression=""/>
+        <default applyOnUpdate="0" field="geom1" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="y_param" expression=""/>
+        <default applyOnUpdate="0" field="total_y" expression=""/>
+        <default applyOnUpdate="0" field="rec_y" expression=""/>
+        <default applyOnUpdate="0" field="geom1_ext" expression=""/>
+        <default applyOnUpdate="0" field="calculed_y" expression=""/>
+        <default applyOnUpdate="0" field="m3mlexc" expression=""/>
+        <default applyOnUpdate="0" field="m2mltrenchl" expression=""/>
+        <default applyOnUpdate="0" field="m2mlbottom" expression=""/>
+        <default applyOnUpdate="0" field="m2mlpav" expression=""/>
+        <default applyOnUpdate="0" field="m3mlprotec" expression=""/>
+        <default applyOnUpdate="0" field="m3mlfill" expression=""/>
+        <default applyOnUpdate="0" field="m3mlexcess" expression=""/>
+        <default applyOnUpdate="0" field="m3exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2trenchl_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2bottom_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2pav_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="pav_cost" expression=""/>
+        <default applyOnUpdate="0" field="exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="trenchl_cost" expression=""/>
+        <default applyOnUpdate="0" field="base_cost" expression=""/>
+        <default applyOnUpdate="0" field="protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="arc_cost" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="length" expression=""/>
+        <default applyOnUpdate="0" field="budget" expression=""/>
+        <default applyOnUpdate="0" field="other_budget" expression=""/>
+        <default applyOnUpdate="0" field="total_budget" expression=""/>
+        <default applyOnUpdate="0" field="builtcost" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="age" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
+        <default applyOnUpdate="0" field="aperiod" expression=""/>
+        <default applyOnUpdate="0" field="arate" expression=""/>
+        <default applyOnUpdate="0" field="amortized" expression=""/>
+        <default applyOnUpdate="0" field="pending" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="mean_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="thickness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="width"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="b"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="bulk"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geom1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_param"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rec_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geom1_ext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="calculed_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlexc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2mltrenchl"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2mlbottom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2mlpav"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlprotec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlfill"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlexcess"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3exc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2trenchl_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2bottom_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2pav_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3protec_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3fill_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3excess_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pav_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="trenchl_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="base_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="protec_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fill_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="excess_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other_budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtcost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="aperiod"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="amortized"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pending"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mean_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="thickness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="width" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="b" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="bulk" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="area" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_param" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rec_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1_ext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="calculed_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlexc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mltrenchl" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mlbottom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mlpav" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlprotec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlfill" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlexcess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2trenchl_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2bottom_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2pav_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pav_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="trenchl_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="base_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other_budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtcost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="aperiod" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="amortized" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pending" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="y1"/>
-        <constraint desc="" exp="" field="y2"/>
-        <constraint desc="" exp="" field="mean_y"/>
-        <constraint desc="" exp="" field="z1"/>
-        <constraint desc="" exp="" field="z2"/>
-        <constraint desc="" exp="" field="thickness"/>
-        <constraint desc="" exp="" field="width"/>
-        <constraint desc="" exp="" field="b"/>
-        <constraint desc="" exp="" field="bulk"/>
-        <constraint desc="" exp="" field="geom1"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="y_param"/>
-        <constraint desc="" exp="" field="total_y"/>
-        <constraint desc="" exp="" field="rec_y"/>
-        <constraint desc="" exp="" field="geom1_ext"/>
-        <constraint desc="" exp="" field="calculed_y"/>
-        <constraint desc="" exp="" field="m3mlexc"/>
-        <constraint desc="" exp="" field="m2mltrenchl"/>
-        <constraint desc="" exp="" field="m2mlbottom"/>
-        <constraint desc="" exp="" field="m2mlpav"/>
-        <constraint desc="" exp="" field="m3mlprotec"/>
-        <constraint desc="" exp="" field="m3mlfill"/>
-        <constraint desc="" exp="" field="m3mlexcess"/>
-        <constraint desc="" exp="" field="m3exc_cost"/>
-        <constraint desc="" exp="" field="m2trenchl_cost"/>
-        <constraint desc="" exp="" field="m2bottom_cost"/>
-        <constraint desc="" exp="" field="m2pav_cost"/>
-        <constraint desc="" exp="" field="m3protec_cost"/>
-        <constraint desc="" exp="" field="m3fill_cost"/>
-        <constraint desc="" exp="" field="m3excess_cost"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="pav_cost"/>
-        <constraint desc="" exp="" field="exc_cost"/>
-        <constraint desc="" exp="" field="trenchl_cost"/>
-        <constraint desc="" exp="" field="base_cost"/>
-        <constraint desc="" exp="" field="protec_cost"/>
-        <constraint desc="" exp="" field="fill_cost"/>
-        <constraint desc="" exp="" field="excess_cost"/>
-        <constraint desc="" exp="" field="arc_cost"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="length"/>
-        <constraint desc="" exp="" field="budget"/>
-        <constraint desc="" exp="" field="other_budget"/>
-        <constraint desc="" exp="" field="total_budget"/>
-        <constraint desc="" exp="" field="builtcost"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="age"/>
-        <constraint desc="" exp="" field="acoeff"/>
-        <constraint desc="" exp="" field="aperiod"/>
-        <constraint desc="" exp="" field="arate"/>
-        <constraint desc="" exp="" field="amortized"/>
-        <constraint desc="" exp="" field="pending"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="y1" desc=""/>
+        <constraint exp="" field="y2" desc=""/>
+        <constraint exp="" field="mean_y" desc=""/>
+        <constraint exp="" field="z1" desc=""/>
+        <constraint exp="" field="z2" desc=""/>
+        <constraint exp="" field="thickness" desc=""/>
+        <constraint exp="" field="width" desc=""/>
+        <constraint exp="" field="b" desc=""/>
+        <constraint exp="" field="bulk" desc=""/>
+        <constraint exp="" field="geom1" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="y_param" desc=""/>
+        <constraint exp="" field="total_y" desc=""/>
+        <constraint exp="" field="rec_y" desc=""/>
+        <constraint exp="" field="geom1_ext" desc=""/>
+        <constraint exp="" field="calculed_y" desc=""/>
+        <constraint exp="" field="m3mlexc" desc=""/>
+        <constraint exp="" field="m2mltrenchl" desc=""/>
+        <constraint exp="" field="m2mlbottom" desc=""/>
+        <constraint exp="" field="m2mlpav" desc=""/>
+        <constraint exp="" field="m3mlprotec" desc=""/>
+        <constraint exp="" field="m3mlfill" desc=""/>
+        <constraint exp="" field="m3mlexcess" desc=""/>
+        <constraint exp="" field="m3exc_cost" desc=""/>
+        <constraint exp="" field="m2trenchl_cost" desc=""/>
+        <constraint exp="" field="m2bottom_cost" desc=""/>
+        <constraint exp="" field="m2pav_cost" desc=""/>
+        <constraint exp="" field="m3protec_cost" desc=""/>
+        <constraint exp="" field="m3fill_cost" desc=""/>
+        <constraint exp="" field="m3excess_cost" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="pav_cost" desc=""/>
+        <constraint exp="" field="exc_cost" desc=""/>
+        <constraint exp="" field="trenchl_cost" desc=""/>
+        <constraint exp="" field="base_cost" desc=""/>
+        <constraint exp="" field="protec_cost" desc=""/>
+        <constraint exp="" field="fill_cost" desc=""/>
+        <constraint exp="" field="excess_cost" desc=""/>
+        <constraint exp="" field="arc_cost" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="length" desc=""/>
+        <constraint exp="" field="budget" desc=""/>
+        <constraint exp="" field="other_budget" desc=""/>
+        <constraint exp="" field="total_budget" desc=""/>
+        <constraint exp="" field="builtcost" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="age" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
+        <constraint exp="" field="aperiod" desc=""/>
+        <constraint exp="" field="arate" desc=""/>
+        <constraint exp="" field="amortized" desc=""/>
+        <constraint exp="" field="pending" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -32736,62 +32193,70 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="node_1" width="-1"/>
-          <column type="field" hidden="0" name="node_2" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="y1" width="-1"/>
-          <column type="field" hidden="0" name="y2" width="-1"/>
-          <column type="field" hidden="0" name="mean_y" width="-1"/>
-          <column type="field" hidden="0" name="z1" width="-1"/>
-          <column type="field" hidden="0" name="z2" width="-1"/>
-          <column type="field" hidden="0" name="thickness" width="-1"/>
-          <column type="field" hidden="0" name="width" width="-1"/>
-          <column type="field" hidden="0" name="b" width="-1"/>
-          <column type="field" hidden="0" name="bulk" width="-1"/>
-          <column type="field" hidden="0" name="geom1" width="-1"/>
-          <column type="field" hidden="0" name="area" width="-1"/>
-          <column type="field" hidden="0" name="y_param" width="-1"/>
-          <column type="field" hidden="0" name="total_y" width="-1"/>
-          <column type="field" hidden="0" name="rec_y" width="-1"/>
-          <column type="field" hidden="0" name="geom1_ext" width="-1"/>
-          <column type="field" hidden="0" name="calculed_y" width="-1"/>
-          <column type="field" hidden="0" name="m3mlexc" width="-1"/>
-          <column type="field" hidden="0" name="m2mltrenchl" width="-1"/>
-          <column type="field" hidden="0" name="m2mlbottom" width="-1"/>
-          <column type="field" hidden="0" name="m2mlpav" width="-1"/>
-          <column type="field" hidden="0" name="m3mlprotec" width="-1"/>
-          <column type="field" hidden="0" name="m3mlfill" width="-1"/>
-          <column type="field" hidden="0" name="m3mlexcess" width="-1"/>
-          <column type="field" hidden="0" name="m3exc_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2trenchl_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2bottom_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2pav_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3protec_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3fill_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3excess_cost" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="-1"/>
-          <column type="field" hidden="0" name="pav_cost" width="-1"/>
-          <column type="field" hidden="0" name="exc_cost" width="-1"/>
-          <column type="field" hidden="0" name="trenchl_cost" width="-1"/>
-          <column type="field" hidden="0" name="base_cost" width="-1"/>
-          <column type="field" hidden="0" name="protec_cost" width="-1"/>
-          <column type="field" hidden="0" name="fill_cost" width="-1"/>
-          <column type="field" hidden="0" name="excess_cost" width="-1"/>
-          <column type="field" hidden="0" name="arc_cost" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="-1"/>
-          <column type="field" hidden="0" name="length" width="-1"/>
-          <column type="field" hidden="0" name="bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="other_bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="total_bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="y1"/>
+          <column type="field" width="-1" hidden="0" name="y2"/>
+          <column type="field" width="-1" hidden="0" name="mean_y"/>
+          <column type="field" width="-1" hidden="0" name="z1"/>
+          <column type="field" width="-1" hidden="0" name="z2"/>
+          <column type="field" width="-1" hidden="0" name="thickness"/>
+          <column type="field" width="-1" hidden="0" name="width"/>
+          <column type="field" width="-1" hidden="0" name="b"/>
+          <column type="field" width="-1" hidden="0" name="bulk"/>
+          <column type="field" width="-1" hidden="0" name="geom1"/>
+          <column type="field" width="-1" hidden="0" name="area"/>
+          <column type="field" width="-1" hidden="0" name="y_param"/>
+          <column type="field" width="-1" hidden="0" name="total_y"/>
+          <column type="field" width="-1" hidden="0" name="rec_y"/>
+          <column type="field" width="-1" hidden="0" name="geom1_ext"/>
+          <column type="field" width="-1" hidden="0" name="calculed_y"/>
+          <column type="field" width="-1" hidden="0" name="m3mlexc"/>
+          <column type="field" width="-1" hidden="0" name="m2mltrenchl"/>
+          <column type="field" width="-1" hidden="0" name="m2mlbottom"/>
+          <column type="field" width="-1" hidden="0" name="m2mlpav"/>
+          <column type="field" width="-1" hidden="0" name="m3mlprotec"/>
+          <column type="field" width="-1" hidden="0" name="m3mlfill"/>
+          <column type="field" width="-1" hidden="0" name="m3mlexcess"/>
+          <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2pav_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="pav_cost"/>
+          <column type="field" width="-1" hidden="0" name="exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="trenchl_cost"/>
+          <column type="field" width="-1" hidden="0" name="base_cost"/>
+          <column type="field" width="-1" hidden="0" name="protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="arc_cost"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="length"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="budget"/>
+          <column type="field" width="-1" hidden="0" name="other_budget"/>
+          <column type="field" width="-1" hidden="0" name="total_budget"/>
+          <column type="field" width="-1" hidden="0" name="builtcost"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="age"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
+          <column type="field" width="-1" hidden="0" name="aperiod"/>
+          <column type="field" width="-1" hidden="0" name="arate"/>
+          <column type="field" width="-1" hidden="0" name="amortized"/>
+          <column type="field" width="-1" hidden="0" name="pending"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -32823,7 +32288,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
+        <field name="age" editable="1"/>
+        <field name="amortized" editable="1"/>
         <field name="annotation" editable="0"/>
+        <field name="aperiod" editable="1"/>
+        <field name="arate" editable="1"/>
         <field name="arc_cost" editable="0"/>
         <field name="arc_id" editable="0"/>
         <field name="arc_type" editable="0"/>
@@ -32832,6 +32302,8 @@ def my_form_open(dialog, layer, feature):
         <field name="b" editable="0"/>
         <field name="base_cost" editable="0"/>
         <field name="budget" editable="0"/>
+        <field name="builtcost" editable="1"/>
+        <field name="builtdate" editable="1"/>
         <field name="bulk" editable="0"/>
         <field name="bSCHEMA_NAMEget" editable="0"/>
         <field name="calculed_y" editable="0"/>
@@ -32865,6 +32337,7 @@ def my_form_open(dialog, layer, feature):
         <field name="other_budget" editable="0"/>
         <field name="other_bSCHEMA_NAMEget" editable="0"/>
         <field name="pav_cost" editable="0"/>
+        <field name="pending" editable="1"/>
         <field name="protec_cost" editable="0"/>
         <field name="rec_y" editable="0"/>
         <field name="sector_id" editable="0"/>
@@ -32883,7 +32356,12 @@ def my_form_open(dialog, layer, feature):
         <field name="z2" editable="0"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
+        <field labelOnTop="0" name="age"/>
+        <field labelOnTop="0" name="amortized"/>
         <field labelOnTop="0" name="annotation"/>
+        <field labelOnTop="0" name="aperiod"/>
+        <field labelOnTop="0" name="arate"/>
         <field labelOnTop="0" name="arc_cost"/>
         <field labelOnTop="0" name="arc_id"/>
         <field labelOnTop="0" name="arc_type"/>
@@ -32891,6 +32369,9 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="area"/>
         <field labelOnTop="0" name="b"/>
         <field labelOnTop="0" name="base_cost"/>
+        <field labelOnTop="0" name="budget"/>
+        <field labelOnTop="0" name="builtcost"/>
+        <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="bulk"/>
         <field labelOnTop="0" name="bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="calculed_y"/>
@@ -32921,14 +32402,17 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="mean_y"/>
         <field labelOnTop="0" name="node_1"/>
         <field labelOnTop="0" name="node_2"/>
+        <field labelOnTop="0" name="other_budget"/>
         <field labelOnTop="0" name="other_bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="pav_cost"/>
+        <field labelOnTop="0" name="pending"/>
         <field labelOnTop="0" name="protec_cost"/>
         <field labelOnTop="0" name="rec_y"/>
         <field labelOnTop="0" name="sector_id"/>
         <field labelOnTop="0" name="soilcat_id"/>
         <field labelOnTop="0" name="state"/>
         <field labelOnTop="0" name="thickness"/>
+        <field labelOnTop="0" name="total_budget"/>
         <field labelOnTop="0" name="total_bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="total_y"/>
         <field labelOnTop="0" name="trenchl_cost"/>
@@ -32943,7 +32427,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="100000" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -32976,6 +32460,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -32989,10 +32482,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -33009,33 +32510,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33044,32 +32545,36 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -33078,8 +32583,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33088,8 +32593,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33098,8 +32603,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33108,8 +32613,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33118,8 +32623,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33128,50 +32633,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33180,8 +32673,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33190,8 +32683,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33200,8 +32693,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33210,194 +32703,233 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtcost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtdate">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="age">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="aperiod">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="arate">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="amortized">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pending">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="nodecat_id" field="nodecat_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="top_elev" field="top_elev"/>
-        <alias index="4" name="elev" field="elev"/>
-        <alias index="5" name="epa_type" field="epa_type"/>
-        <alias index="6" name="state" field="state"/>
-        <alias index="7" name="sector_id" field="sector_id"/>
-        <alias index="8" name="expl_id" field="expl_id"/>
-        <alias index="9" name="cost_unit" field="cost_unit"/>
-        <alias index="10" name="descript" field="descript"/>
-        <alias index="11" name="measurement" field="measurement"/>
-        <alias index="12" name="cost" field="cost"/>
-        <alias index="13" name="budget" field="budget"/>
-        <alias index="14" name="" field="builtcost"/>
-        <alias index="15" name="" field="builtdate"/>
-        <alias index="16" name="" field="age"/>
-        <alias index="17" name="" field="acoeff"/>
-        <alias index="18" name="" field="aperiod"/>
-        <alias index="19" name="" field="arate"/>
-        <alias index="20" name="" field="amortized"/>
-        <alias index="21" name="" field="pending"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="nodecat_id" name="nodecat_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="top_elev" name="top_elev" index="3"/>
+        <alias field="elev" name="elev" index="4"/>
+        <alias field="epa_type" name="epa_type" index="5"/>
+        <alias field="state" name="state" index="6"/>
+        <alias field="sector_id" name="sector_id" index="7"/>
+        <alias field="expl_id" name="expl_id" index="8"/>
+        <alias field="cost_unit" name="cost_unit" index="9"/>
+        <alias field="descript" name="descript" index="10"/>
+        <alias field="measurement" name="measurement" index="11"/>
+        <alias field="cost" name="cost" index="12"/>
+        <alias field="budget" name="budget" index="13"/>
+        <alias field="builtcost" name="" index="14"/>
+        <alias field="builtdate" name="" index="15"/>
+        <alias field="age" name="" index="16"/>
+        <alias field="acoeff" name="" index="17"/>
+        <alias field="aperiod" name="" index="18"/>
+        <alias field="arate" name="" index="19"/>
+        <alias field="amortized" name="" index="20"/>
+        <alias field="pending" name="" index="21"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="top_elev" applyOnUpdate="0"/>
-        <default expression="" field="elev" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="measurement" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="budget" applyOnUpdate="0"/>
-        <default expression="" field="builtcost" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="age" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
-        <default expression="" field="aperiod" applyOnUpdate="0"/>
-        <default expression="" field="arate" applyOnUpdate="0"/>
-        <default expression="" field="amortized" applyOnUpdate="0"/>
-        <default expression="" field="pending" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="top_elev" expression=""/>
+        <default applyOnUpdate="0" field="elev" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="measurement" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="budget" expression=""/>
+        <default applyOnUpdate="0" field="builtcost" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="age" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
+        <default applyOnUpdate="0" field="aperiod" expression=""/>
+        <default applyOnUpdate="0" field="arate" expression=""/>
+        <default applyOnUpdate="0" field="amortized" expression=""/>
+        <default applyOnUpdate="0" field="pending" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="top_elev"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elev"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="measurement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtcost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="aperiod"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="amortized"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pending"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="top_elev" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elev" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="measurement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtcost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="aperiod" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="amortized" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pending" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="top_elev"/>
-        <constraint desc="" exp="" field="elev"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="measurement"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="budget"/>
-        <constraint desc="" exp="" field="builtcost"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="age"/>
-        <constraint desc="" exp="" field="acoeff"/>
-        <constraint desc="" exp="" field="aperiod"/>
-        <constraint desc="" exp="" field="arate"/>
-        <constraint desc="" exp="" field="amortized"/>
-        <constraint desc="" exp="" field="pending"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="top_elev" desc=""/>
+        <constraint exp="" field="elev" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="measurement" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="budget" desc=""/>
+        <constraint exp="" field="builtcost" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="age" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
+        <constraint exp="" field="aperiod" desc=""/>
+        <constraint exp="" field="arate" desc=""/>
+        <constraint exp="" field="amortized" desc=""/>
+        <constraint exp="" field="pending" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="top_elev" width="-1"/>
-          <column type="field" hidden="0" name="elev" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="122"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="calculated_depth" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="-1"/>
-          <column type="field" hidden="0" name="bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="top_elev"/>
+          <column type="field" width="-1" hidden="0" name="elev"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="122" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="measurement"/>
+          <column type="field" width="-1" hidden="0" name="budget"/>
+          <column type="field" width="-1" hidden="0" name="builtcost"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="age"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
+          <column type="field" width="-1" hidden="0" name="aperiod"/>
+          <column type="field" width="-1" hidden="0" name="arate"/>
+          <column type="field" width="-1" hidden="0" name="amortized"/>
+          <column type="field" width="-1" hidden="0" name="pending"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -33429,7 +32961,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
+        <field name="age" editable="1"/>
+        <field name="amortized" editable="1"/>
+        <field name="aperiod" editable="1"/>
+        <field name="arate" editable="1"/>
         <field name="budget" editable="0"/>
+        <field name="builtcost" editable="1"/>
+        <field name="builtdate" editable="1"/>
         <field name="bSCHEMA_NAMEget" editable="0"/>
         <field name="cost" editable="0"/>
         <field name="cost_unit" editable="0"/>
@@ -33441,16 +32980,40 @@ def my_form_open(dialog, layer, feature):
         <field name="node_id" editable="0"/>
         <field name="node_type" editable="0"/>
         <field name="nodecat_id" editable="0"/>
+        <field name="pending" editable="1"/>
         <field name="sector_id" editable="0"/>
         <field name="state" editable="0"/>
         <field name="top_elev" editable="0"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
+        <field labelOnTop="0" name="age"/>
+        <field labelOnTop="0" name="amortized"/>
+        <field labelOnTop="0" name="aperiod"/>
+        <field labelOnTop="0" name="arate"/>
+        <field labelOnTop="0" name="budget"/>
+        <field labelOnTop="0" name="builtcost"/>
+        <field labelOnTop="0" name="builtdate"/>
+        <field labelOnTop="0" name="cost"/>
+        <field labelOnTop="0" name="cost_unit"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="elev"/>
+        <field labelOnTop="0" name="epa_type"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="measurement"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="node_type"/>
+        <field labelOnTop="0" name="nodecat_id"/>
+        <field labelOnTop="0" name="pending"/>
+        <field labelOnTop="0" name="sector_id"/>
+        <field labelOnTop="0" name="state"/>
+        <field labelOnTop="0" name="top_elev"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("descript", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc20180206173632206</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc" (the_geom) sql=</datasource>
       <keywordList>
@@ -33490,7 +33053,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -33510,162 +33073,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -33673,49 +33236,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -33727,28 +33290,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="arc_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -33757,8 +33320,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -33884,116 +33447,116 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="arc_id" field="arc_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="arc_type" field="arc_type"/>
-        <alias index="3" name="arccat_id" field="arccat_id"/>
-        <alias index="4" name="max_flow" field="max_flow"/>
-        <alias index="5" name="min_flow" field="min_flow"/>
-        <alias index="6" name="max_vel" field="max_vel"/>
-        <alias index="7" name="min_vel" field="min_vel"/>
-        <alias index="8" name="max_headloss" field="max_headloss"/>
-        <alias index="9" name="min_headloss" field="min_headloss"/>
-        <alias index="10" name="max_uheadloss" field="max_uheadloss"/>
-        <alias index="11" name="min_uheadloss" field="min_uheadloss"/>
-        <alias index="12" name="max_setting" field="max_setting"/>
-        <alias index="13" name="min_setting" field="min_setting"/>
-        <alias index="14" name="max_reaction" field="max_reaction"/>
-        <alias index="15" name="min_reaction" field="min_reaction"/>
-        <alias index="16" name="max_ffactor" field="max_ffactor"/>
-        <alias index="17" name="min_ffactor" field="min_ffactor"/>
+        <alias field="arc_id" name="arc_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="arc_type" name="arc_type" index="2"/>
+        <alias field="arccat_id" name="arccat_id" index="3"/>
+        <alias field="max_flow" name="max_flow" index="4"/>
+        <alias field="min_flow" name="min_flow" index="5"/>
+        <alias field="max_vel" name="max_vel" index="6"/>
+        <alias field="min_vel" name="min_vel" index="7"/>
+        <alias field="max_headloss" name="max_headloss" index="8"/>
+        <alias field="min_headloss" name="min_headloss" index="9"/>
+        <alias field="max_uheadloss" name="max_uheadloss" index="10"/>
+        <alias field="min_uheadloss" name="min_uheadloss" index="11"/>
+        <alias field="max_setting" name="max_setting" index="12"/>
+        <alias field="min_setting" name="min_setting" index="13"/>
+        <alias field="max_reaction" name="max_reaction" index="14"/>
+        <alias field="min_reaction" name="min_reaction" index="15"/>
+        <alias field="max_ffactor" name="max_ffactor" index="16"/>
+        <alias field="min_ffactor" name="min_ffactor" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="max_flow" applyOnUpdate="0"/>
-        <default expression="" field="min_flow" applyOnUpdate="0"/>
-        <default expression="" field="max_vel" applyOnUpdate="0"/>
-        <default expression="" field="min_vel" applyOnUpdate="0"/>
-        <default expression="" field="max_headloss" applyOnUpdate="0"/>
-        <default expression="" field="min_headloss" applyOnUpdate="0"/>
-        <default expression="" field="max_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="min_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="max_setting" applyOnUpdate="0"/>
-        <default expression="" field="min_setting" applyOnUpdate="0"/>
-        <default expression="" field="max_reaction" applyOnUpdate="0"/>
-        <default expression="" field="min_reaction" applyOnUpdate="0"/>
-        <default expression="" field="max_ffactor" applyOnUpdate="0"/>
-        <default expression="" field="min_ffactor" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_ffactor"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="max_flow"/>
-        <constraint desc="" exp="" field="min_flow"/>
-        <constraint desc="" exp="" field="max_vel"/>
-        <constraint desc="" exp="" field="min_vel"/>
-        <constraint desc="" exp="" field="max_headloss"/>
-        <constraint desc="" exp="" field="min_headloss"/>
-        <constraint desc="" exp="" field="max_uheadloss"/>
-        <constraint desc="" exp="" field="min_uheadloss"/>
-        <constraint desc="" exp="" field="max_setting"/>
-        <constraint desc="" exp="" field="min_setting"/>
-        <constraint desc="" exp="" field="max_reaction"/>
-        <constraint desc="" exp="" field="min_reaction"/>
-        <constraint desc="" exp="" field="max_ffactor"/>
-        <constraint desc="" exp="" field="min_ffactor"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="max_flow" width="-1"/>
-          <column type="field" hidden="0" name="min_flow" width="-1"/>
-          <column type="field" hidden="0" name="max_vel" width="-1"/>
-          <column type="field" hidden="0" name="min_vel" width="-1"/>
-          <column type="field" hidden="0" name="max_headloss" width="-1"/>
-          <column type="field" hidden="0" name="min_headloss" width="-1"/>
-          <column type="field" hidden="0" name="max_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="min_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="max_setting" width="-1"/>
-          <column type="field" hidden="0" name="min_setting" width="-1"/>
-          <column type="field" hidden="0" name="max_reaction" width="-1"/>
-          <column type="field" hidden="0" name="min_reaction" width="-1"/>
-          <column type="field" hidden="0" name="max_ffactor" width="-1"/>
-          <column type="field" hidden="0" name="min_ffactor" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34049,7 +33612,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_all20180309112714512</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -34089,7 +33652,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -34109,31 +33672,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="20,173,40,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="20,173,40,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34146,7 +33709,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -34162,8 +33725,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -34233,75 +33796,75 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="arc_type" field="arc_type"/>
-        <alias index="4" name="arccat_id" field="arccat_id"/>
-        <alias index="5" name="flow" field="flow"/>
-        <alias index="6" name="vel" field="vel"/>
-        <alias index="7" name="headloss" field="headloss"/>
-        <alias index="8" name="setting" field="setting"/>
-        <alias index="9" name="ffactor" field="ffactor"/>
-        <alias index="10" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="arc_type" name="arc_type" index="3"/>
+        <alias field="arccat_id" name="arccat_id" index="4"/>
+        <alias field="flow" name="flow" index="5"/>
+        <alias field="vel" name="vel" index="6"/>
+        <alias field="headloss" name="headloss" index="7"/>
+        <alias field="setting" name="setting" index="8"/>
+        <alias field="ffactor" name="ffactor" index="9"/>
+        <alias field="time" name="time" index="10"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="vel" applyOnUpdate="0"/>
-        <default expression="" field="headloss" applyOnUpdate="0"/>
-        <default expression="" field="setting" applyOnUpdate="0"/>
-        <default expression="" field="ffactor" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="vel"/>
-        <constraint desc="" exp="" field="headloss"/>
-        <constraint desc="" exp="" field="setting"/>
-        <constraint desc="" exp="" field="ffactor"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="flow" width="-1"/>
-          <column type="field" hidden="0" name="vel" width="-1"/>
-          <column type="field" hidden="0" name="headloss" width="-1"/>
-          <column type="field" hidden="0" name="setting" width="-1"/>
-          <column type="field" hidden="0" name="ffactor" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34334,7 +33897,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_hourly20180309112714378</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -34374,7 +33937,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -34394,162 +33957,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -34557,49 +34120,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -34611,28 +34174,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -34648,8 +34211,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -34705,71 +34268,71 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="flow" field="flow"/>
-        <alias index="4" name="vel" field="vel"/>
-        <alias index="5" name="headloss" field="headloss"/>
-        <alias index="6" name="setting" field="setting"/>
-        <alias index="7" name="ffactor" field="ffactor"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="flow" name="flow" index="3"/>
+        <alias field="vel" name="vel" index="4"/>
+        <alias field="headloss" name="headloss" index="5"/>
+        <alias field="setting" name="setting" index="6"/>
+        <alias field="ffactor" name="ffactor" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="vel" applyOnUpdate="0"/>
-        <default expression="" field="headloss" applyOnUpdate="0"/>
-        <default expression="" field="setting" applyOnUpdate="0"/>
-        <default expression="" field="ffactor" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="vel"/>
-        <constraint desc="" exp="" field="headloss"/>
-        <constraint desc="" exp="" field="setting"/>
-        <constraint desc="" exp="" field="ffactor"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{bc968d00-0198-4e46-9f58-2fe359b28284}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{bc968d00-0198-4e46-9f58-2fe359b28284}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="flow" width="-1"/>
-          <column type="field" hidden="0" name="vel" width="-1"/>
-          <column type="field" hidden="0" name="headloss" width="-1"/>
-          <column type="field" hidden="0" name="setting" width="-1"/>
-          <column type="field" hidden="0" name="ffactor" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34816,7 +34379,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc20160710012004554</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_arc</shortname>
@@ -34857,7 +34420,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -34870,174 +34433,174 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <map-layer-style-manager current="arc maxheadloss">
         <map-layer-style name="% arc headloss">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_uheadloss" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_uheadloss" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.5 %" lower="0.000000000000000" upper="0.500000000000000" render="true"/>
-                <range symbol="1" label=" 0.5 - 1.0 %" lower="0.500000000000000" upper="1.000000000000000" render="true"/>
-                <range symbol="2" label=" 1.0 - 10.0 %" lower="1.000000000000000" upper="10.000000000000000" render="true"/>
-                <range symbol="3" label="> 10.0 %" lower="10.000000000000000" upper="100.000000000000000" render="true"/>
+                <range upper="0.500000000000000" render="true" lower="0.000000000000000" label="&lt; 0.5 %" symbol="0"/>
+                <range upper="1.000000000000000" render="true" lower="0.500000000000000" label=" 0.5 - 1.0 %" symbol="1"/>
+                <range upper="10.000000000000000" render="true" lower="1.000000000000000" label=" 1.0 - 10.0 %" symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="10.000000000000000" label="> 10.0 %" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="1" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="1" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -35187,37 +34750,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -35251,174 +34814,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="arc maxflow">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="-4.65661e-10" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_flow" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_flow" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.50 l/s" lower="-0.290000000000000" upper="0.500000000000000" render="true"/>
-                <range symbol="1" label="0.50 - 1.50 l/s" lower="0.500000000000000" upper="1.500000000000000" render="true"/>
-                <range symbol="2" label="1.50 - 2.50 l/s " lower="1.500000000000000" upper="2.500000000000000" render="true"/>
-                <range symbol="3" label="> 2.5 l/s" lower="2.500000000000000" upper="100.000000000000000" render="true"/>
+                <range upper="0.500000000000000" render="true" lower="-0.290000000000000" label="&lt; 0.50 l/s" symbol="0"/>
+                <range upper="1.500000000000000" render="true" lower="0.500000000000000" label="0.50 - 1.50 l/s" symbol="1"/>
+                <range upper="2.500000000000000" render="true" lower="1.500000000000000" label="1.50 - 2.50 l/s " symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="2.500000000000000" label="> 2.5 l/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="2" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -35568,37 +35131,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -35633,174 +35196,174 @@ def my_form_open(dialog, layer, feature):
         </map-layer-style>
         <map-layer-style name="arc maxheadloss"/>
         <map-layer-style name="arc maxvelocity">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_vel" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_vel" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.15 m/s" lower="0.000000000000000" upper="0.150000000000000" render="true"/>
-                <range symbol="1" label=" 0.15 - 0.30 m/s" lower="0.150000000000000" upper="0.300000000000000" render="true"/>
-                <range symbol="2" label=" 0.30 - 0.45 m/s " lower="0.300000000000000" upper="0.450000000000000" render="true"/>
-                <range symbol="3" label="> 0.45 m/s" lower="0.450000000000000" upper="2.000000000000000" render="true"/>
+                <range upper="0.150000000000000" render="true" lower="0.000000000000000" label="&lt; 0.15 m/s" symbol="0"/>
+                <range upper="0.300000000000000" render="true" lower="0.150000000000000" label=" 0.15 - 0.30 m/s" symbol="1"/>
+                <range upper="0.450000000000000" render="true" lower="0.300000000000000" label=" 0.30 - 0.45 m/s " symbol="2"/>
+                <range upper="2.000000000000000" render="true" lower="0.450000000000000" label="> 0.45 m/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="2" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -35950,37 +35513,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -36014,174 +35577,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="predeterminado">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="-4.65661e-10" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.06" lower="0.000000000000000" upper="0.060000000000000" render="true"/>
-                <range symbol="1" label=" 0.06 - 0.12" lower="0.060000000000000" upper="0.120000000000000" render="true"/>
-                <range symbol="2" label=" 0.10 - 0.18" lower="0.120000000000000" upper="0.180000000000000" render="true"/>
-                <range symbol="3" label=" > 0.18" lower="0.180000000000000" upper="200.000000000000000" render="true"/>
+                <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06" symbol="0"/>
+                <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12" symbol="1"/>
+                <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.10 - 0.18" symbol="2"/>
+                <range upper="200.000000000000000" render="true" lower="0.180000000000000" label=" > 0.18" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="0" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="0" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -36331,37 +35894,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -36401,162 +35964,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -36564,49 +36127,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -36618,28 +36181,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="arc_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -36648,8 +36211,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -36761,106 +36324,106 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="arc_id" field="arc_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="max_flow" field="max_flow"/>
-        <alias index="3" name="min_flow" field="min_flow"/>
-        <alias index="4" name="max_vel" field="max_vel"/>
-        <alias index="5" name="min_vel" field="min_vel"/>
-        <alias index="6" name="max_headloss" field="max_headloss"/>
-        <alias index="7" name="min_headloss" field="min_headloss"/>
-        <alias index="8" name="max_uheadloss" field="max_uheadloss"/>
-        <alias index="9" name="min_uheadloss" field="min_uheadloss"/>
-        <alias index="10" name="max_setting" field="max_setting"/>
-        <alias index="11" name="min_setting" field="min_setting"/>
-        <alias index="12" name="max_reaction" field="max_reaction"/>
-        <alias index="13" name="min_reaction" field="min_reaction"/>
-        <alias index="14" name="max_ffactor" field="max_ffactor"/>
-        <alias index="15" name="min_ffactor" field="min_ffactor"/>
+        <alias field="arc_id" name="arc_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="max_flow" name="max_flow" index="2"/>
+        <alias field="min_flow" name="min_flow" index="3"/>
+        <alias field="max_vel" name="max_vel" index="4"/>
+        <alias field="min_vel" name="min_vel" index="5"/>
+        <alias field="max_headloss" name="max_headloss" index="6"/>
+        <alias field="min_headloss" name="min_headloss" index="7"/>
+        <alias field="max_uheadloss" name="max_uheadloss" index="8"/>
+        <alias field="min_uheadloss" name="min_uheadloss" index="9"/>
+        <alias field="max_setting" name="max_setting" index="10"/>
+        <alias field="min_setting" name="min_setting" index="11"/>
+        <alias field="max_reaction" name="max_reaction" index="12"/>
+        <alias field="min_reaction" name="min_reaction" index="13"/>
+        <alias field="max_ffactor" name="max_ffactor" index="14"/>
+        <alias field="min_ffactor" name="min_ffactor" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="max_flow" applyOnUpdate="0"/>
-        <default expression="" field="min_flow" applyOnUpdate="0"/>
-        <default expression="" field="max_vel" applyOnUpdate="0"/>
-        <default expression="" field="min_vel" applyOnUpdate="0"/>
-        <default expression="" field="max_headloss" applyOnUpdate="0"/>
-        <default expression="" field="min_headloss" applyOnUpdate="0"/>
-        <default expression="" field="max_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="min_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="max_setting" applyOnUpdate="0"/>
-        <default expression="" field="min_setting" applyOnUpdate="0"/>
-        <default expression="" field="max_reaction" applyOnUpdate="0"/>
-        <default expression="" field="min_reaction" applyOnUpdate="0"/>
-        <default expression="" field="max_ffactor" applyOnUpdate="0"/>
-        <default expression="" field="min_ffactor" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_ffactor"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="max_flow"/>
-        <constraint desc="" exp="" field="min_flow"/>
-        <constraint desc="" exp="" field="max_vel"/>
-        <constraint desc="" exp="" field="min_vel"/>
-        <constraint desc="" exp="" field="max_headloss"/>
-        <constraint desc="" exp="" field="min_headloss"/>
-        <constraint desc="" exp="" field="max_uheadloss"/>
-        <constraint desc="" exp="" field="min_uheadloss"/>
-        <constraint desc="" exp="" field="max_setting"/>
-        <constraint desc="" exp="" field="min_setting"/>
-        <constraint desc="" exp="" field="max_reaction"/>
-        <constraint desc="" exp="" field="min_reaction"/>
-        <constraint desc="" exp="" field="max_ffactor"/>
-        <constraint desc="" exp="" field="min_ffactor"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="max_flow" width="-1"/>
-          <column type="field" hidden="0" name="min_flow" width="-1"/>
-          <column type="field" hidden="0" name="max_vel" width="-1"/>
-          <column type="field" hidden="0" name="min_vel" width="-1"/>
-          <column type="field" hidden="0" name="max_headloss" width="-1"/>
-          <column type="field" hidden="0" name="min_headloss" width="-1"/>
-          <column type="field" hidden="0" name="max_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="min_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="max_setting" width="-1"/>
-          <column type="field" hidden="0" name="min_setting" width="-1"/>
-          <column type="field" hidden="0" name="max_reaction" width="-1"/>
-          <column type="field" hidden="0" name="min_reaction" width="-1"/>
-          <column type="field" hidden="0" name="max_ffactor" width="-1"/>
-          <column type="field" hidden="0" name="min_ffactor" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -36914,7 +36477,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc_hourly20180309112714639</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -36954,7 +36517,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -36974,162 +36537,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -37137,49 +36700,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -37191,28 +36754,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -37228,8 +36791,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -37285,71 +36848,71 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="flow" field="flow"/>
-        <alias index="4" name="vel" field="vel"/>
-        <alias index="5" name="headloss" field="headloss"/>
-        <alias index="6" name="setting" field="setting"/>
-        <alias index="7" name="ffactor" field="ffactor"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="flow" name="flow" index="3"/>
+        <alias field="vel" name="vel" index="4"/>
+        <alias field="headloss" name="headloss" index="5"/>
+        <alias field="setting" name="setting" index="6"/>
+        <alias field="ffactor" name="ffactor" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="vel" applyOnUpdate="0"/>
-        <default expression="" field="headloss" applyOnUpdate="0"/>
-        <default expression="" field="setting" applyOnUpdate="0"/>
-        <default expression="" field="ffactor" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="vel"/>
-        <constraint desc="" exp="" field="headloss"/>
-        <constraint desc="" exp="" field="setting"/>
-        <constraint desc="" exp="" field="ffactor"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="flow" width="-1"/>
-          <column type="field" hidden="0" name="vel" width="-1"/>
-          <column type="field" hidden="0" name="headloss" width="-1"/>
-          <column type="field" hidden="0" name="setting" width="-1"/>
-          <column type="field" hidden="0" name="ffactor" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -37396,7 +36959,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_energy_usage20160710012004617</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_energy_usage" sql=</datasource>
       <shortname>v_rpt_comp_energy_usage</shortname>
@@ -37437,7 +37000,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -37458,7 +37021,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -37495,8 +37058,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -37531,65 +37094,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="nodarc_id" field="nodarc_id"/>
-        <alias index="3" name="usage_fact" field="usage_fact"/>
-        <alias index="4" name="avg_effic" field="avg_effic"/>
-        <alias index="5" name="kwhr_mgal" field="kwhr_mgal"/>
-        <alias index="6" name="avg_kw" field="avg_kw"/>
-        <alias index="7" name="peak_kw" field="peak_kw"/>
-        <alias index="8" name="cost_day" field="cost_day"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="nodarc_id" name="nodarc_id" index="2"/>
+        <alias field="usage_fact" name="usage_fact" index="3"/>
+        <alias field="avg_effic" name="avg_effic" index="4"/>
+        <alias field="kwhr_mgal" name="kwhr_mgal" index="5"/>
+        <alias field="avg_kw" name="avg_kw" index="6"/>
+        <alias field="peak_kw" name="peak_kw" index="7"/>
+        <alias field="cost_day" name="cost_day" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="nodarc_id" applyOnUpdate="0"/>
-        <default expression="" field="usage_fact" applyOnUpdate="0"/>
-        <default expression="" field="avg_effic" applyOnUpdate="0"/>
-        <default expression="" field="kwhr_mgal" applyOnUpdate="0"/>
-        <default expression="" field="avg_kw" applyOnUpdate="0"/>
-        <default expression="" field="peak_kw" applyOnUpdate="0"/>
-        <default expression="" field="cost_day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodarc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="usage_fact"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_effic"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="kwhr_mgal"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="peak_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_day"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="nodarc_id"/>
-        <constraint desc="" exp="" field="usage_fact"/>
-        <constraint desc="" exp="" field="avg_effic"/>
-        <constraint desc="" exp="" field="kwhr_mgal"/>
-        <constraint desc="" exp="" field="avg_kw"/>
-        <constraint desc="" exp="" field="peak_kw"/>
-        <constraint desc="" exp="" field="cost_day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="nodarc_id" width="-1"/>
-          <column type="field" hidden="0" name="usage_fact" width="-1"/>
-          <column type="field" hidden="0" name="avg_effic" width="-1"/>
-          <column type="field" hidden="0" name="kwhr_mgal" width="-1"/>
-          <column type="field" hidden="0" name="avg_kw" width="-1"/>
-          <column type="field" hidden="0" name="peak_kw" width="-1"/>
-          <column type="field" hidden="0" name="cost_day" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -37620,7 +37183,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_hydraulic_status20160710012004648</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_hydraulic_status" sql=</datasource>
       <shortname>v_rpt_comp_hydraulic_status</shortname>
@@ -37661,7 +37224,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -37682,7 +37245,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -37691,8 +37254,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -37720,40 +37283,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="time" field="time"/>
-        <alias index="3" name="text" field="text"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="time" name="time" index="2"/>
+        <alias field="text" name="text" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="time"/>
-        <constraint desc="" exp="" field="text"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -37779,7 +37342,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node20160710012004695</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_node</shortname>
@@ -37820,7 +37383,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -37840,202 +37403,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -38043,49 +37606,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -38097,28 +37660,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -38216,81 +37779,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="nodecat_id" field="nodecat_id"/>
-        <alias index="4" name="elevation" field="elevation"/>
-        <alias index="5" name="max_demand" field="max_demand"/>
-        <alias index="6" name="min_demand" field="min_demand"/>
-        <alias index="7" name="max_head" field="max_head"/>
-        <alias index="8" name="min_head" field="min_head"/>
-        <alias index="9" name="max_pressure" field="max_pressure"/>
-        <alias index="10" name="min_pressure" field="min_pressure"/>
-        <alias index="11" name="max_quality" field="max_quality"/>
-        <alias index="12" name="min_quality" field="min_quality"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="nodecat_id" name="nodecat_id" index="3"/>
+        <alias field="elevation" name="elevation" index="4"/>
+        <alias field="max_demand" name="max_demand" index="5"/>
+        <alias field="min_demand" name="min_demand" index="6"/>
+        <alias field="max_head" name="max_head" index="7"/>
+        <alias field="min_head" name="min_head" index="8"/>
+        <alias field="max_pressure" name="max_pressure" index="9"/>
+        <alias field="min_pressure" name="min_pressure" index="10"/>
+        <alias field="max_quality" name="max_quality" index="11"/>
+        <alias field="min_quality" name="min_quality" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="min_demand" width="-1"/>
-          <column type="field" hidden="0" name="min_head" width="-1"/>
-          <column type="field" hidden="0" name="min_pressure" width="-1"/>
-          <column type="field" hidden="0" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="min_demand"/>
+          <column type="field" width="-1" hidden="0" name="min_head"/>
+          <column type="field" width="-1" hidden="0" name="min_pressure"/>
+          <column type="field" width="-1" hidden="0" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -38341,7 +37904,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_copiar20161230144859228</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -38381,7 +37944,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -38401,202 +37964,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -38604,49 +38167,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -38658,28 +38221,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -38688,8 +38251,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38698,8 +38261,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38708,8 +38271,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38718,8 +38281,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38728,8 +38291,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38738,8 +38301,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38755,8 +38318,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38772,8 +38335,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38789,8 +38352,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38804,81 +38367,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="node_type"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="elevation"/>
-        <alias index="5" name="" field="max_demand"/>
-        <alias index="6" name="" field="min_demand"/>
-        <alias index="7" name="" field="max_head"/>
-        <alias index="8" name="" field="min_head"/>
-        <alias index="9" name="" field="max_pressure"/>
-        <alias index="10" name="" field="min_pressure"/>
-        <alias index="11" name="" field="max_quality"/>
-        <alias index="12" name="" field="min_quality"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="node_type" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="elevation" name="" index="4"/>
+        <alias field="max_demand" name="" index="5"/>
+        <alias field="min_demand" name="" index="6"/>
+        <alias field="max_head" name="" index="7"/>
+        <alias field="min_head" name="" index="8"/>
+        <alias field="max_pressure" name="" index="9"/>
+        <alias field="min_pressure" name="" index="10"/>
+        <alias field="max_quality" name="" index="11"/>
+        <alias field="min_quality" name="" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5b334259-4694-4093-810f-160d8a437c1d}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5b334259-4694-4093-810f-160d8a437c1d}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -38915,7 +38478,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_hourly20180309112714764</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -38955,7 +38518,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -38975,33 +38538,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="211,184,132,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="211,184,132,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -39014,7 +38577,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39051,8 +38614,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39087,65 +38650,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="elevation" field="elevation"/>
-        <alias index="4" name="demand" field="demand"/>
-        <alias index="5" name="head" field="head"/>
-        <alias index="6" name="press" field="press"/>
-        <alias index="7" name="quality" field="quality"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="elevation" name="elevation" index="3"/>
+        <alias field="demand" name="demand" index="4"/>
+        <alias field="head" name="head" index="5"/>
+        <alias field="press" name="press" index="6"/>
+        <alias field="quality" name="quality" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="press" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="press"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="press"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="demand" width="-1"/>
-          <column type="field" hidden="0" name="head" width="-1"/>
-          <column type="field" hidden="0" name="press" width="-1"/>
-          <column type="field" hidden="0" name="quality" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="press"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39176,7 +38739,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_energy_usage20180201122650430</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_energy_usage" sql=</datasource>
       <keywordList>
@@ -39216,7 +38779,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -39237,7 +38800,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39274,8 +38837,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39310,65 +38873,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="nodarc_id" field="nodarc_id"/>
-        <alias index="3" name="usage_fact" field="usage_fact"/>
-        <alias index="4" name="avg_effic" field="avg_effic"/>
-        <alias index="5" name="kwhr_mgal" field="kwhr_mgal"/>
-        <alias index="6" name="avg_kw" field="avg_kw"/>
-        <alias index="7" name="peak_kw" field="peak_kw"/>
-        <alias index="8" name="cost_day" field="cost_day"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="nodarc_id" name="nodarc_id" index="2"/>
+        <alias field="usage_fact" name="usage_fact" index="3"/>
+        <alias field="avg_effic" name="avg_effic" index="4"/>
+        <alias field="kwhr_mgal" name="kwhr_mgal" index="5"/>
+        <alias field="avg_kw" name="avg_kw" index="6"/>
+        <alias field="peak_kw" name="peak_kw" index="7"/>
+        <alias field="cost_day" name="cost_day" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="nodarc_id" applyOnUpdate="0"/>
-        <default expression="" field="usage_fact" applyOnUpdate="0"/>
-        <default expression="" field="avg_effic" applyOnUpdate="0"/>
-        <default expression="" field="kwhr_mgal" applyOnUpdate="0"/>
-        <default expression="" field="avg_kw" applyOnUpdate="0"/>
-        <default expression="" field="peak_kw" applyOnUpdate="0"/>
-        <default expression="" field="cost_day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodarc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="usage_fact"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_effic"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="kwhr_mgal"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="peak_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_day"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="nodarc_id"/>
-        <constraint desc="" exp="" field="usage_fact"/>
-        <constraint desc="" exp="" field="avg_effic"/>
-        <constraint desc="" exp="" field="kwhr_mgal"/>
-        <constraint desc="" exp="" field="avg_kw"/>
-        <constraint desc="" exp="" field="peak_kw"/>
-        <constraint desc="" exp="" field="cost_day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="nodarc_id" width="-1"/>
-          <column type="field" hidden="0" name="usage_fact" width="-1"/>
-          <column type="field" hidden="0" name="avg_effic" width="-1"/>
-          <column type="field" hidden="0" name="kwhr_mgal" width="-1"/>
-          <column type="field" hidden="0" name="avg_kw" width="-1"/>
-          <column type="field" hidden="0" name="peak_kw" width="-1"/>
-          <column type="field" hidden="0" name="cost_day" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39399,7 +38962,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_hydraulic_status20131203141738132</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_hydraulic_status" sql=</datasource>
       <keywordList>
@@ -39439,7 +39002,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -39460,7 +39023,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39469,8 +39032,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39498,46 +39061,46 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="time" field="time"/>
-        <alias index="3" name="text" field="text"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="time" name="time" index="2"/>
+        <alias field="text" name="text" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="time"/>
-        <constraint desc="" exp="" field="text"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{678b4af2-e189-408a-baf7-c84b798c5250}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{678b4af2-e189-408a-baf7-c84b798c5250}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39563,7 +39126,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node20180206173632034</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -39603,7 +39166,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -39623,202 +39186,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="min_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="min_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -39826,49 +39389,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="60,60,60,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="60,60,60,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -39880,28 +39443,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39999,81 +39562,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="nodecat_id" field="nodecat_id"/>
-        <alias index="4" name="elevation" field="elevation"/>
-        <alias index="5" name="max_demand" field="max_demand"/>
-        <alias index="6" name="min_demand" field="min_demand"/>
-        <alias index="7" name="max_head" field="max_head"/>
-        <alias index="8" name="min_head" field="min_head"/>
-        <alias index="9" name="max_pressure" field="max_pressure"/>
-        <alias index="10" name="min_pressure" field="min_pressure"/>
-        <alias index="11" name="max_quality" field="max_quality"/>
-        <alias index="12" name="min_quality" field="min_quality"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="nodecat_id" name="nodecat_id" index="3"/>
+        <alias field="elevation" name="elevation" index="4"/>
+        <alias field="max_demand" name="max_demand" index="5"/>
+        <alias field="min_demand" name="min_demand" index="6"/>
+        <alias field="max_head" name="max_head" index="7"/>
+        <alias field="min_head" name="min_head" index="8"/>
+        <alias field="max_pressure" name="max_pressure" index="9"/>
+        <alias field="min_pressure" name="min_pressure" index="10"/>
+        <alias field="max_quality" name="max_quality" index="11"/>
+        <alias field="min_quality" name="min_quality" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="max_demand" width="-1"/>
-          <column type="field" hidden="0" name="max_head" width="-1"/>
-          <column type="field" hidden="0" name="max_pressure" width="-1"/>
-          <column type="field" hidden="0" name="max_quality" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="max_demand"/>
+          <column type="field" width="-1" hidden="0" name="max_head"/>
+          <column type="field" width="-1" hidden="0" name="max_pressure"/>
+          <column type="field" width="-1" hidden="0" name="max_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -40124,7 +39687,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "node_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_all20180309112714890</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -40164,7 +39727,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -40184,202 +39747,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -40387,49 +39950,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -40441,28 +40004,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -40513,8 +40076,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -40549,73 +40112,73 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="nodecat_id" field="nodecat_id"/>
-        <alias index="4" name="result_id" field="result_id"/>
-        <alias index="5" name="elevation" field="elevation"/>
-        <alias index="6" name="demand" field="demand"/>
-        <alias index="7" name="head" field="head"/>
-        <alias index="8" name="press" field="press"/>
-        <alias index="9" name="quality" field="quality"/>
-        <alias index="10" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="nodecat_id" name="nodecat_id" index="3"/>
+        <alias field="result_id" name="result_id" index="4"/>
+        <alias field="elevation" name="elevation" index="5"/>
+        <alias field="demand" name="demand" index="6"/>
+        <alias field="head" name="head" index="7"/>
+        <alias field="press" name="press" index="8"/>
+        <alias field="quality" name="quality" index="9"/>
+        <alias field="time" name="time" index="10"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="press" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="press"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="press"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -40664,7 +40227,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_hourly20180309112715024</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -40704,7 +40267,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -40724,202 +40287,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -40927,49 +40490,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -40981,28 +40544,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -41039,8 +40602,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -41075,65 +40638,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="elevation" field="elevation"/>
-        <alias index="4" name="demand" field="demand"/>
-        <alias index="5" name="head" field="head"/>
-        <alias index="6" name="press" field="press"/>
-        <alias index="7" name="quality" field="quality"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="elevation" name="elevation" index="3"/>
+        <alias field="demand" name="demand" index="4"/>
+        <alias field="head" name="head" index="5"/>
+        <alias field="press" name="press" index="6"/>
+        <alias field="quality" name="quality" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="press" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="press"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="press"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -41180,9 +40743,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_config_sysfields" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_config_sysfields" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -41197,7 +40760,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -41220,7 +40783,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -41241,11 +40804,9 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value>"formname"</value>
-        </property>
+        <property key="dualview/previewExpressions" value="&quot;formname&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -41450,126 +41011,126 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="rid"/>
-        <alias index="1" name="" field="formname"/>
-        <alias index="2" name="" field="formtype"/>
-        <alias index="3" name="" field="columnname"/>
-        <alias index="4" name="" field="label"/>
-        <alias index="5" name="" field="hidden"/>
-        <alias index="6" name="" field="layoutname"/>
-        <alias index="7" name="" field="layoutorder"/>
-        <alias index="8" name="" field="iseditable"/>
-        <alias index="9" name="" field="ismandatory"/>
-        <alias index="10" name="" field="datatype"/>
-        <alias index="11" name="" field="widgettype"/>
-        <alias index="12" name="" field="widgetdim"/>
-        <alias index="13" name="" field="tooltip"/>
-        <alias index="14" name="" field="placeholder"/>
-        <alias index="15" name="" field="stylesheet"/>
-        <alias index="16" name="" field="isparent"/>
-        <alias index="17" name="" field="isautoupdate"/>
-        <alias index="18" name="" field="dv_querytext"/>
-        <alias index="19" name="" field="dv_orderby_id"/>
-        <alias index="20" name="" field="dv_isnullvalue"/>
-        <alias index="21" name="" field="dv_parent_id"/>
-        <alias index="22" name="" field="dv_querytext_filterc"/>
-        <alias index="23" name="" field="widgetcontrols"/>
-        <alias index="24" name="" field="widgetfunction"/>
-        <alias index="25" name="" field="linkedaction"/>
-        <alias index="26" name="" field="listfilterparam"/>
-        <alias index="27" name="" field="cat_feature_id"/>
+        <alias field="rid" name="" index="0"/>
+        <alias field="formname" name="" index="1"/>
+        <alias field="formtype" name="" index="2"/>
+        <alias field="columnname" name="" index="3"/>
+        <alias field="label" name="" index="4"/>
+        <alias field="hidden" name="" index="5"/>
+        <alias field="layoutname" name="" index="6"/>
+        <alias field="layoutorder" name="" index="7"/>
+        <alias field="iseditable" name="" index="8"/>
+        <alias field="ismandatory" name="" index="9"/>
+        <alias field="datatype" name="" index="10"/>
+        <alias field="widgettype" name="" index="11"/>
+        <alias field="widgetdim" name="" index="12"/>
+        <alias field="tooltip" name="" index="13"/>
+        <alias field="placeholder" name="" index="14"/>
+        <alias field="stylesheet" name="" index="15"/>
+        <alias field="isparent" name="" index="16"/>
+        <alias field="isautoupdate" name="" index="17"/>
+        <alias field="dv_querytext" name="" index="18"/>
+        <alias field="dv_orderby_id" name="" index="19"/>
+        <alias field="dv_isnullvalue" name="" index="20"/>
+        <alias field="dv_parent_id" name="" index="21"/>
+        <alias field="dv_querytext_filterc" name="" index="22"/>
+        <alias field="widgetcontrols" name="" index="23"/>
+        <alias field="widgetfunction" name="" index="24"/>
+        <alias field="linkedaction" name="" index="25"/>
+        <alias field="listfilterparam" name="" index="26"/>
+        <alias field="cat_feature_id" name="" index="27"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="rid" applyOnUpdate="0"/>
-        <default expression="" field="formname" applyOnUpdate="0"/>
-        <default expression="" field="formtype" applyOnUpdate="0"/>
-        <default expression="" field="columnname" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="hidden" applyOnUpdate="0"/>
-        <default expression="" field="layoutname" applyOnUpdate="0"/>
-        <default expression="" field="layoutorder" applyOnUpdate="0"/>
-        <default expression="" field="iseditable" applyOnUpdate="0"/>
-        <default expression="" field="ismandatory" applyOnUpdate="0"/>
-        <default expression="" field="datatype" applyOnUpdate="0"/>
-        <default expression="" field="widgettype" applyOnUpdate="0"/>
-        <default expression="" field="widgetdim" applyOnUpdate="0"/>
-        <default expression="" field="tooltip" applyOnUpdate="0"/>
-        <default expression="" field="placeholder" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
-        <default expression="" field="isparent" applyOnUpdate="0"/>
-        <default expression="" field="isautoupdate" applyOnUpdate="0"/>
-        <default expression="" field="dv_querytext" applyOnUpdate="0"/>
-        <default expression="" field="dv_orderby_id" applyOnUpdate="0"/>
-        <default expression="" field="dv_isnullvalue" applyOnUpdate="0"/>
-        <default expression="" field="dv_parent_id" applyOnUpdate="0"/>
-        <default expression="" field="dv_querytext_filterc" applyOnUpdate="0"/>
-        <default expression="" field="widgetcontrols" applyOnUpdate="0"/>
-        <default expression="" field="widgetfunction" applyOnUpdate="0"/>
-        <default expression="" field="linkedaction" applyOnUpdate="0"/>
-        <default expression="" field="listfilterparam" applyOnUpdate="0"/>
-        <default expression="" field="cat_feature_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="rid" expression=""/>
+        <default applyOnUpdate="0" field="formname" expression=""/>
+        <default applyOnUpdate="0" field="formtype" expression=""/>
+        <default applyOnUpdate="0" field="columnname" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="hidden" expression=""/>
+        <default applyOnUpdate="0" field="layoutname" expression=""/>
+        <default applyOnUpdate="0" field="layoutorder" expression=""/>
+        <default applyOnUpdate="0" field="iseditable" expression=""/>
+        <default applyOnUpdate="0" field="ismandatory" expression=""/>
+        <default applyOnUpdate="0" field="datatype" expression=""/>
+        <default applyOnUpdate="0" field="widgettype" expression=""/>
+        <default applyOnUpdate="0" field="widgetdim" expression=""/>
+        <default applyOnUpdate="0" field="tooltip" expression=""/>
+        <default applyOnUpdate="0" field="placeholder" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
+        <default applyOnUpdate="0" field="isparent" expression=""/>
+        <default applyOnUpdate="0" field="isautoupdate" expression=""/>
+        <default applyOnUpdate="0" field="dv_querytext" expression=""/>
+        <default applyOnUpdate="0" field="dv_orderby_id" expression=""/>
+        <default applyOnUpdate="0" field="dv_isnullvalue" expression=""/>
+        <default applyOnUpdate="0" field="dv_parent_id" expression=""/>
+        <default applyOnUpdate="0" field="dv_querytext_filterc" expression=""/>
+        <default applyOnUpdate="0" field="widgetcontrols" expression=""/>
+        <default applyOnUpdate="0" field="widgetfunction" expression=""/>
+        <default applyOnUpdate="0" field="linkedaction" expression=""/>
+        <default applyOnUpdate="0" field="listfilterparam" expression=""/>
+        <default applyOnUpdate="0" field="cat_feature_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="rid"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="formname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="formtype"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="columnname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hidden"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="layoutname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="layoutorder"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="iseditable"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ismandatory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="datatype"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgettype"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgetdim"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tooltip"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="placeholder"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="isparent"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="isautoupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_querytext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_orderby_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_isnullvalue"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_querytext_filterc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgetcontrols"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgetfunction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="linkedaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="listfilterparam"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_feature_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="rid" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="formname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="formtype" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="columnname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hidden" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="layoutname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="layoutorder" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="iseditable" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ismandatory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="datatype" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgettype" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgetdim" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tooltip" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placeholder" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isparent" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isautoupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_querytext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_orderby_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_isnullvalue" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_querytext_filterc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgetcontrols" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgetfunction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="linkedaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="listfilterparam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_feature_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="rid"/>
-        <constraint desc="" exp="" field="formname"/>
-        <constraint desc="" exp="" field="formtype"/>
-        <constraint desc="" exp="" field="columnname"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="hidden"/>
-        <constraint desc="" exp="" field="layoutname"/>
-        <constraint desc="" exp="" field="layoutorder"/>
-        <constraint desc="" exp="" field="iseditable"/>
-        <constraint desc="" exp="" field="ismandatory"/>
-        <constraint desc="" exp="" field="datatype"/>
-        <constraint desc="" exp="" field="widgettype"/>
-        <constraint desc="" exp="" field="widgetdim"/>
-        <constraint desc="" exp="" field="tooltip"/>
-        <constraint desc="" exp="" field="placeholder"/>
-        <constraint desc="" exp="" field="stylesheet"/>
-        <constraint desc="" exp="" field="isparent"/>
-        <constraint desc="" exp="" field="isautoupdate"/>
-        <constraint desc="" exp="" field="dv_querytext"/>
-        <constraint desc="" exp="" field="dv_orderby_id"/>
-        <constraint desc="" exp="" field="dv_isnullvalue"/>
-        <constraint desc="" exp="" field="dv_parent_id"/>
-        <constraint desc="" exp="" field="dv_querytext_filterc"/>
-        <constraint desc="" exp="" field="widgetcontrols"/>
-        <constraint desc="" exp="" field="widgetfunction"/>
-        <constraint desc="" exp="" field="linkedaction"/>
-        <constraint desc="" exp="" field="listfilterparam"/>
-        <constraint desc="" exp="" field="cat_feature_id"/>
+        <constraint exp="" field="rid" desc=""/>
+        <constraint exp="" field="formname" desc=""/>
+        <constraint exp="" field="formtype" desc=""/>
+        <constraint exp="" field="columnname" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="layoutname" desc=""/>
+        <constraint exp="" field="layoutorder" desc=""/>
+        <constraint exp="" field="iseditable" desc=""/>
+        <constraint exp="" field="ismandatory" desc=""/>
+        <constraint exp="" field="datatype" desc=""/>
+        <constraint exp="" field="widgettype" desc=""/>
+        <constraint exp="" field="widgetdim" desc=""/>
+        <constraint exp="" field="tooltip" desc=""/>
+        <constraint exp="" field="placeholder" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
+        <constraint exp="" field="isparent" desc=""/>
+        <constraint exp="" field="isautoupdate" desc=""/>
+        <constraint exp="" field="dv_querytext" desc=""/>
+        <constraint exp="" field="dv_orderby_id" desc=""/>
+        <constraint exp="" field="dv_isnullvalue" desc=""/>
+        <constraint exp="" field="dv_parent_id" desc=""/>
+        <constraint exp="" field="dv_querytext_filterc" desc=""/>
+        <constraint exp="" field="widgetcontrols" desc=""/>
+        <constraint exp="" field="widgetfunction" desc=""/>
+        <constraint exp="" field="linkedaction" desc=""/>
+        <constraint exp="" field="listfilterparam" desc=""/>
+        <constraint exp="" field="cat_feature_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -41577,35 +41138,35 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="rid" width="-1"/>
-          <column type="field" hidden="0" name="formname" width="-1"/>
-          <column type="field" hidden="0" name="formtype" width="-1"/>
-          <column type="field" hidden="0" name="columnname" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="hidden" width="-1"/>
-          <column type="field" hidden="0" name="layoutname" width="-1"/>
-          <column type="field" hidden="0" name="layoutorder" width="-1"/>
-          <column type="field" hidden="0" name="iseditable" width="-1"/>
-          <column type="field" hidden="0" name="ismandatory" width="-1"/>
-          <column type="field" hidden="0" name="datatype" width="-1"/>
-          <column type="field" hidden="0" name="widgettype" width="-1"/>
-          <column type="field" hidden="0" name="widgetdim" width="-1"/>
-          <column type="field" hidden="0" name="tooltip" width="-1"/>
-          <column type="field" hidden="0" name="placeholder" width="-1"/>
-          <column type="field" hidden="0" name="stylesheet" width="-1"/>
-          <column type="field" hidden="0" name="isparent" width="-1"/>
-          <column type="field" hidden="0" name="isautoupdate" width="-1"/>
-          <column type="field" hidden="0" name="dv_querytext" width="-1"/>
-          <column type="field" hidden="0" name="dv_orderby_id" width="-1"/>
-          <column type="field" hidden="0" name="dv_isnullvalue" width="-1"/>
-          <column type="field" hidden="0" name="dv_parent_id" width="-1"/>
-          <column type="field" hidden="0" name="dv_querytext_filterc" width="-1"/>
-          <column type="field" hidden="0" name="widgetcontrols" width="-1"/>
-          <column type="field" hidden="0" name="widgetfunction" width="-1"/>
-          <column type="field" hidden="0" name="linkedaction" width="-1"/>
-          <column type="field" hidden="0" name="listfilterparam" width="-1"/>
-          <column type="field" hidden="0" name="cat_feature_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="rid"/>
+          <column type="field" width="-1" hidden="0" name="formname"/>
+          <column type="field" width="-1" hidden="0" name="formtype"/>
+          <column type="field" width="-1" hidden="0" name="columnname"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="hidden"/>
+          <column type="field" width="-1" hidden="0" name="layoutname"/>
+          <column type="field" width="-1" hidden="0" name="layoutorder"/>
+          <column type="field" width="-1" hidden="0" name="iseditable"/>
+          <column type="field" width="-1" hidden="0" name="ismandatory"/>
+          <column type="field" width="-1" hidden="0" name="datatype"/>
+          <column type="field" width="-1" hidden="0" name="widgettype"/>
+          <column type="field" width="-1" hidden="0" name="widgetdim"/>
+          <column type="field" width="-1" hidden="0" name="tooltip"/>
+          <column type="field" width="-1" hidden="0" name="placeholder"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="field" width="-1" hidden="0" name="isparent"/>
+          <column type="field" width="-1" hidden="0" name="isautoupdate"/>
+          <column type="field" width="-1" hidden="0" name="dv_querytext"/>
+          <column type="field" width="-1" hidden="0" name="dv_orderby_id"/>
+          <column type="field" width="-1" hidden="0" name="dv_isnullvalue"/>
+          <column type="field" width="-1" hidden="0" name="dv_parent_id"/>
+          <column type="field" width="-1" hidden="0" name="dv_querytext_filterc"/>
+          <column type="field" width="-1" hidden="0" name="widgetcontrols"/>
+          <column type="field" width="-1" hidden="0" name="widgetfunction"/>
+          <column type="field" width="-1" hidden="0" name="linkedaction"/>
+          <column type="field" width="-1" hidden="0" name="listfilterparam"/>
+          <column type="field" width="-1" hidden="0" name="cat_feature_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -41626,7 +41187,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"formname"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -41685,7 +41246,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -41709,26 +41270,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -41745,28 +41306,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -41787,22 +41348,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="pol_id"/>
-        <alias index="1" name="" field="connec_id"/>
+        <alias field="pol_id" name="" index="0"/>
+        <alias field="connec_id" name="" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="connec_id"/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -41810,9 +41371,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -41855,7 +41416,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -41914,7 +41475,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -41938,26 +41499,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -41974,28 +41535,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -42016,22 +41577,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="pol_id"/>
-        <alias index="1" name="" field="node_id"/>
+        <alias field="pol_id" name="" index="0"/>
+        <alias field="node_id" name="" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="node_id"/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -42039,9 +41600,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -42084,7 +41645,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -42143,7 +41704,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -42167,26 +41728,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -42203,28 +41764,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -42245,22 +41806,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="pol_id"/>
-        <alias index="1" name="" field="node_id"/>
+        <alias field="pol_id" name="" index="0"/>
+        <alias field="node_id" name="" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="node_id"/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -42268,9 +41829,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -42373,21 +41934,20 @@ def my_form_open(dialog, layer, feature):
     <layer id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a"/>
     <layer id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3"/>
     <layer id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e"/>
-    <layer id="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a"/>
   </layerorder>
   <properties>
     <DBManager>
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -43078,63 +42638,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" units="mm" name="composer_plan" printResolution="300">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" offsetY="0" resolution="10"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="0" background="true" frame="false" type="65638" outlineWidthM="0.3,mm" position="0,0,mm" opacity="1" positionLock="false" size="210,297,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" positionOnPage="0,0,mm" blendMode="0">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -43142,563 +42702,563 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="34" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.5098,248.929,mm" opacity="1" marginX="0" positionLock="false" size="98.6069,5.60773,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" marginY="0" positionOnPage="18.5098,248.929,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
       </LayoutItem>
-      <LayoutItem svgFillColor="255,255,255,255" pictureRotation="0" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" referencePoint="0" visibility="1" excludeFromExports="0" svgBorderColor="0,0,0,255" zValue="34" background="false" northMode="0" frame="false" resizeMode="0" svgBorderWidth="0.2" type="65640" outlineWidthM="0.3,mm" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" position="21.2488,12.0899,mm" opacity="1" mapUuid="" positionLock="false" size="52.9371,8.05991,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" anchorPoint="0" pictureHeight="8.05991" northOffset="0" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" positionOnPage="21.2488,12.0899,mm" blendMode="0" pictureWidth="8.01076">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="33" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.5098,240.85,mm" opacity="1" marginX="0" positionLock="false" size="98.6069,5.60773,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" marginY="0" positionOnPage="18.5098,240.85,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="32" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="130.06,170.278,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" marginY="0" positionOnPage="130.06,170.278,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="31" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.892,162.595,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" marginY="0" positionOnPage="129.892,162.595,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="30" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.892,154.849,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.77795,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" marginY="0" positionOnPage="129.892,154.849,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="29" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.5119,237.417,mm" opacity="1" shapeType="1" positionLock="false" size="107.352,0.232607,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" positionOnPage="18.5119,237.417,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="28" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,170.278,mm" opacity="1" marginX="0" positionLock="false" size="55.7139,5.07458,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total cost of other works:" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" marginY="0" positionOnPage="18.472,170.278,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="27" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.472,180.075,mm" opacity="1" shapeType="1" positionLock="false" size="177.254,0.21446,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" positionOnPage="18.472,180.075,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="26" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.798,191.26,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" marginY="0" positionOnPage="129.798,191.26,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="25" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.798,184.169,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.77795,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" marginY="0" positionOnPage="129.798,184.169,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="24" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.5098,144.841,mm" opacity="1" marginX="0" positionLock="false" size="97.7075,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" marginY="0" positionOnPage="18.5098,144.841,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="23" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,162.595,mm" opacity="1" marginX="0" positionLock="false" size="55.7139,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total cost for node elements:" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" marginY="0" positionOnPage="18.472,162.595,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="22" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.4712,202.127,mm" opacity="1" shapeType="1" positionLock="false" size="178.105,0.232607,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" positionOnPage="18.4712,202.127,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="21" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.472,149.994,mm" opacity="1" shapeType="1" positionLock="false" size="177.254,0.21446,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" positionOnPage="18.472,149.994,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="19" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.1613,8.922,mm" opacity="1" shapeType="1" positionLock="false" size="0.851544,16.1039,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" positionOnPage="17.1613,8.922,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="18" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.1613,8.922,mm" opacity="1" shapeType="1" positionLock="false" size="179.415,0.863719,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" positionOnPage="17.1613,8.922,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="17" background="true" labelMargin="0,mm" frame="true" type="65639" outlineWidthM="0.2,mm" followPreset="false" followPresetName="" position="131.014,237.517,mm" opacity="1" positionLock="false" size="65.4621,46.5539,mm" keepLayerSet="true" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" drawCanvasItems="true" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" positionOnPage="131.014,237.517,mm" blendMode="0" mapFlags="0" mapRotation="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="4576100.62452332023531199" xmin="418477.63581281033111736" xmax="419842.63581420265836641" ymax="4577071.35527538601309061"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Node material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres">cat_mat_node20160224165702530</Layer>
-          <Layer name="Arc material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres">cat_mat_arc20160224165702501</Layer>
-          <Layer name="Node catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres">cat_node20151105202206790</Layer>
-          <Layer name="Arc catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres">cat_arc20151120192002466</Layer>
-          <Layer name="Connec catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres">cat_connec20160216122620764</Layer>
-          <Layer name="Element material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres">cat_mat_element20160224165702516</Layer>
-          <Layer name="Element catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres">cat_element20160224165938446</Layer>
-          <Layer name="Owner catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres">cat_owner20160224165938429</Layer>
-          <Layer name="Soil catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres">cat_soil20151105202206837</Layer>
-          <Layer name="Pavement catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres">cat_pavement20170111155456255</Layer>
-          <Layer name="Work catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres">cat_work20160216122620842</Layer>
-          <Layer name="Builder catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres">cat_builder20160216122620733</Layer>
-          <Layer name="Brand model catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres">cat_brand_model20180131084332427</Layer>
-          <Layer name="Brand catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres">cat_brand20180131084235586</Layer>
-          <Layer name="Users catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres">cat_users20180131084332505</Layer>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres" name="Node material catalog">cat_mat_node20160224165702530</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres" name="Arc material catalog">cat_mat_arc20160224165702501</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres" name="Node catalog">cat_node20151105202206790</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres" name="Arc catalog">cat_arc20151120192002466</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres" name="Connec catalog">cat_connec20160216122620764</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres" name="Element material catalog">cat_mat_element20160224165702516</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres" name="Element catalog">cat_element20160224165938446</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres" name="Owner catalog">cat_owner20160224165938429</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres" name="Soil catalog">cat_soil20151105202206837</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres" name="Pavement catalog">cat_pavement20170111155456255</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres" name="Work catalog">cat_work20160216122620842</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres" name="Builder catalog">cat_builder20160216122620733</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres" name="Brand model catalog">cat_brand_model20180131084332427</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres" name="Brand catalog">cat_brand20180131084235586</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres" name="Users catalog">cat_users20180131084332505</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle layerid="cat_arc20151120192002466" name="Arc catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="-4.65661e-10" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres" name="Arc catalog" layerid="cat_arc20151120192002466">
+            <qgis readOnly="0" version="2.18.14" minimumScale="-4.65661e-10" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="arctype_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="arc_type20151120180544344" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="arc_type20151120180544344" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_arc20160224165702501" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_arc20160224165702501" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="pnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dint">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dext">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="z1">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="z2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="width">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="area">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="estimated_depth">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="bulk">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_unit">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m2bottom_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3protec_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="arctype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="pnom"/>
-                <alias index="4" name="" field="dnom"/>
-                <alias index="5" name="" field="dint"/>
-                <alias index="6" name="" field="dext"/>
-                <alias index="7" name="" field="descript"/>
-                <alias index="8" name="" field="link"/>
-                <alias index="9" name="" field="brand"/>
-                <alias index="10" name="" field="model"/>
-                <alias index="11" name="" field="svg"/>
-                <alias index="12" name="" field="z1"/>
-                <alias index="13" name="" field="z2"/>
-                <alias index="14" name="" field="width"/>
-                <alias index="15" name="" field="area"/>
-                <alias index="16" name="" field="estimated_depth"/>
-                <alias index="17" name="" field="bulk"/>
-                <alias index="18" name="" field="cost_unit"/>
-                <alias index="19" name="" field="cost"/>
-                <alias index="20" name="" field="m2bottom_cost"/>
-                <alias index="21" name="" field="m3protec_cost"/>
-                <alias index="22" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="arctype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="pnom" index="3"/>
+                <alias name="" field="dnom" index="4"/>
+                <alias name="" field="dint" index="5"/>
+                <alias name="" field="dext" index="6"/>
+                <alias name="" field="descript" index="7"/>
+                <alias name="" field="link" index="8"/>
+                <alias name="" field="brand" index="9"/>
+                <alias name="" field="model" index="10"/>
+                <alias name="" field="svg" index="11"/>
+                <alias name="" field="z1" index="12"/>
+                <alias name="" field="z2" index="13"/>
+                <alias name="" field="width" index="14"/>
+                <alias name="" field="area" index="15"/>
+                <alias name="" field="estimated_depth" index="16"/>
+                <alias name="" field="bulk" index="17"/>
+                <alias name="" field="cost_unit" index="18"/>
+                <alias name="" field="cost" index="19"/>
+                <alias name="" field="m2bottom_cost" index="20"/>
+                <alias name="" field="m3protec_cost" index="21"/>
+                <alias name="" field="active" index="22"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="arctype_id" width="-1"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="pnom" width="-1"/>
-                  <column type="field" hidden="0" name="dnom" width="-1"/>
-                  <column type="field" hidden="0" name="dint" width="-1"/>
-                  <column type="field" hidden="0" name="dext" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="159"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="148"/>
-                  <column type="field" hidden="0" name="z1" width="-1"/>
-                  <column type="field" hidden="0" name="z2" width="-1"/>
-                  <column type="field" hidden="0" name="width" width="-1"/>
-                  <column type="field" hidden="0" name="area" width="-1"/>
-                  <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-                  <column type="field" hidden="0" name="bulk" width="-1"/>
-                  <column type="field" hidden="0" name="cost_unit" width="-1"/>
-                  <column type="field" hidden="0" name="cost" width="-1"/>
-                  <column type="field" hidden="0" name="m2bottom_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m3protec_cost" width="-1"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="arctype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="pnom"/>
+                  <column type="field" width="-1" hidden="0" name="dnom"/>
+                  <column type="field" width="-1" hidden="0" name="dint"/>
+                  <column type="field" width="-1" hidden="0" name="dext"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="159" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="148" hidden="0" name="svg"/>
+                  <column type="field" width="-1" hidden="0" name="z1"/>
+                  <column type="field" width="-1" hidden="0" name="z2"/>
+                  <column type="field" width="-1" hidden="0" name="width"/>
+                  <column type="field" width="-1" hidden="0" name="area"/>
+                  <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+                  <column type="field" width="-1" hidden="0" name="bulk"/>
+                  <column type="field" width="-1" hidden="0" name="cost_unit"/>
+                  <column type="field" width="-1" hidden="0" name="cost"/>
+                  <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -43758,34 +43318,34 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_brand20180131084235586" name="Brand catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres" name="Brand catalog" layerid="cat_brand20180131084235586">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>.</editform>
@@ -43809,39 +43369,39 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_brand_model20180131084332427" name="Brand model catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres" name="Brand model catalog" layerid="cat_brand_model20180131084332427">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="catbrand_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="catbrand_id"/>
-                <alias index="2" name="" field="descript"/>
-                <alias index="3" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="catbrand_id" index="1"/>
+                <alias name="" field="descript" index="2"/>
+                <alias name="" field="link" index="3"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="catbrand_id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="catbrand_id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>.</editform>
@@ -43866,36 +43426,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_builder20160216122620733" name="Builder catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres" name="Builder catalog" layerid="cat_builder20160216122620733">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -43919,101 +43479,101 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_connec20160216122620764" name="Connec catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres" name="Connec catalog" layerid="cat_connec20160216122620764">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="connectype_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_arc20160224165702501" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_arc20160224165702501" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="pnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dint">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dext">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_ut">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_ml">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_m3">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="connectype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="pnom"/>
-                <alias index="4" name="" field="dnom"/>
-                <alias index="5" name="" field="dint"/>
-                <alias index="6" name="" field="dext"/>
-                <alias index="7" name="" field="descript"/>
-                <alias index="8" name="" field="link"/>
-                <alias index="9" name="" field="brand"/>
-                <alias index="10" name="" field="model"/>
-                <alias index="11" name="" field="svg"/>
-                <alias index="12" name="" field="cost_ut"/>
-                <alias index="13" name="" field="cost_ml"/>
-                <alias index="14" name="" field="cost_m3"/>
-                <alias index="15" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="connectype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="pnom" index="3"/>
+                <alias name="" field="dnom" index="4"/>
+                <alias name="" field="dint" index="5"/>
+                <alias name="" field="dext" index="6"/>
+                <alias name="" field="descript" index="7"/>
+                <alias name="" field="link" index="8"/>
+                <alias name="" field="brand" index="9"/>
+                <alias name="" field="model" index="10"/>
+                <alias name="" field="svg" index="11"/>
+                <alias name="" field="cost_ut" index="12"/>
+                <alias name="" field="cost_ml" index="13"/>
+                <alias name="" field="cost_m3" index="14"/>
+                <alias name="" field="active" index="15"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="132"/>
-                  <column type="field" hidden="0" name="connectype_id" width="-1"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="pnom" width="-1"/>
-                  <column type="field" hidden="0" name="dnom" width="-1"/>
-                  <column type="field" hidden="0" name="dint" width="-1"/>
-                  <column type="field" hidden="0" name="dext" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="-1"/>
-                  <column type="field" hidden="0" name="cost_ut" width="140"/>
-                  <column type="field" hidden="0" name="cost_ml" width="-1"/>
-                  <column type="field" hidden="0" name="cost_m3" width="-1"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="132" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="connectype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="pnom"/>
+                  <column type="field" width="-1" hidden="0" name="dnom"/>
+                  <column type="field" width="-1" hidden="0" name="dint"/>
+                  <column type="field" width="-1" hidden="0" name="dext"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="-1" hidden="0" name="svg"/>
+                  <column type="field" width="140" hidden="0" name="cost_ut"/>
+                  <column type="field" width="-1" hidden="0" name="cost_ml"/>
+                  <column type="field" width="-1" hidden="0" name="cost_m3"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44066,76 +43626,76 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_element20160224165938446" name="Element catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres" name="Element catalog" layerid="cat_element20160224165938446">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="elementtype_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="element_type20160224171001597" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="element_type20160224171001597" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_element20160224165702516" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_element20160224165702516" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="geometry">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="type">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="elementtype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="geometry"/>
-                <alias index="4" name="" field="descript"/>
-                <alias index="5" name="" field="link"/>
-                <alias index="6" name="" field="brand"/>
-                <alias index="7" name="" field="type"/>
-                <alias index="8" name="" field="model"/>
-                <alias index="9" name="" field="svg"/>
-                <alias index="10" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="elementtype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="geometry" index="3"/>
+                <alias name="" field="descript" index="4"/>
+                <alias name="" field="link" index="5"/>
+                <alias name="" field="brand" index="6"/>
+                <alias name="" field="type" index="7"/>
+                <alias name="" field="model" index="8"/>
+                <alias name="" field="svg" index="9"/>
+                <alias name="" field="active" index="10"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="elementtype_id" width="-1"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="geometry" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="type" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="-1"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="geometry"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="type"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="-1" hidden="0" name="svg"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44167,36 +43727,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_mat_arc20160224165702501" name="Arc material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres" name="Arc material catalog" layerid="cat_mat_arc20160224165702501">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44220,36 +43780,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_mat_element20160224165702516" name="Element material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres" name="Element material catalog" layerid="cat_mat_element20160224165702516">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="167"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="167" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44273,36 +43833,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_mat_node20160224165702530" name="Node material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres" name="Node material catalog" layerid="cat_mat_node20160224165702530">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44326,106 +43886,106 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_node20151105202206790" name="Node catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres" name="Node catalog" layerid="cat_node20151105202206790">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="nodetype_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="node_type20151120182614953" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="node_type20151120182614953" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_node20160224165702530" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_node20160224165702530" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="pnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dint">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dext">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="shape">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="estimated_depth">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="cost_unit">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="price_value_unit20160710014513523" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="price_value_unit20160710014513523" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="nodetype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="pnom"/>
-                <alias index="4" name="" field="dnom"/>
-                <alias index="5" name="" field="dint"/>
-                <alias index="6" name="" field="dext"/>
-                <alias index="7" name="" field="shape"/>
-                <alias index="8" name="" field="descript"/>
-                <alias index="9" name="" field="link"/>
-                <alias index="10" name="" field="brand"/>
-                <alias index="11" name="" field="model"/>
-                <alias index="12" name="" field="svg"/>
-                <alias index="13" name="" field="estimated_depth"/>
-                <alias index="14" name="" field="cost_unit"/>
-                <alias index="15" name="" field="cost"/>
-                <alias index="16" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="nodetype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="pnom" index="3"/>
+                <alias name="" field="dnom" index="4"/>
+                <alias name="" field="dint" index="5"/>
+                <alias name="" field="dext" index="6"/>
+                <alias name="" field="shape" index="7"/>
+                <alias name="" field="descript" index="8"/>
+                <alias name="" field="link" index="9"/>
+                <alias name="" field="brand" index="10"/>
+                <alias name="" field="model" index="11"/>
+                <alias name="" field="svg" index="12"/>
+                <alias name="" field="estimated_depth" index="13"/>
+                <alias name="" field="cost_unit" index="14"/>
+                <alias name="" field="cost" index="15"/>
+                <alias name="" field="active" index="16"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="&quot;cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="129"/>
-                  <column type="field" hidden="0" name="nodetype_id" width="115"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="pnom" width="-1"/>
-                  <column type="field" hidden="0" name="dnom" width="-1"/>
-                  <column type="field" hidden="0" name="dint" width="-1"/>
-                  <column type="field" hidden="0" name="dext" width="-1"/>
-                  <column type="field" hidden="0" name="shape" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="104"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="115"/>
-                  <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-                  <column type="field" hidden="0" name="cost_unit" width="-1"/>
-                  <column type="field" hidden="0" name="cost" width="156"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="129" hidden="0" name="id"/>
+                  <column type="field" width="115" hidden="0" name="nodetype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="pnom"/>
+                  <column type="field" width="-1" hidden="0" name="dnom"/>
+                  <column type="field" width="-1" hidden="0" name="dint"/>
+                  <column type="field" width="-1" hidden="0" name="dext"/>
+                  <column type="field" width="-1" hidden="0" name="shape"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="104" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="115" hidden="0" name="svg"/>
+                  <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+                  <column type="field" width="-1" hidden="0" name="cost_unit"/>
+                  <column type="field" width="156" hidden="0" name="cost"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44479,36 +44039,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_owner20160224165938429" name="Owner catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres" name="Owner catalog" layerid="cat_owner20160224165938429">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44532,44 +44092,44 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_pavement20170111155456255" name="Pavement catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres" name="Pavement catalog" layerid="cat_pavement20170111155456255">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="thickness">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m2_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
-                <alias index="3" name="" field="thickness"/>
-                <alias index="4" name="" field="m2_cost"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
+                <alias name="" field="thickness" index="3"/>
+                <alias name="" field="m2_cost" index="4"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="thickness" width="-1"/>
-                  <column type="field" hidden="0" name="m2_cost" width="121"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="thickness"/>
+                  <column type="field" width="121" hidden="0" name="m2_cost"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44595,71 +44155,71 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_soil20151105202206837" name="Soil catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres" name="Soil catalog" layerid="cat_soil20151105202206837">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_param">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="b">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="trenchlining">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3exc_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3fill_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3excess_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m2trenchl_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
-                <alias index="3" name="" field="y_param"/>
-                <alias index="4" name="" field="b"/>
-                <alias index="5" name="" field="trenchlining"/>
-                <alias index="6" name="" field="m3exc_cost"/>
-                <alias index="7" name="" field="m3fill_cost"/>
-                <alias index="8" name="" field="m3excess_cost"/>
-                <alias index="9" name="" field="m2trenchl_cost"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
+                <alias name="" field="y_param" index="3"/>
+                <alias name="" field="b" index="4"/>
+                <alias name="" field="trenchlining" index="5"/>
+                <alias name="" field="m3exc_cost" index="6"/>
+                <alias name="" field="m3fill_cost" index="7"/>
+                <alias name="" field="m3excess_cost" index="8"/>
+                <alias name="" field="m2trenchl_cost" index="9"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="&quot;m3fill_cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="194"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="y_param" width="-1"/>
-                  <column type="field" hidden="0" name="b" width="-1"/>
-                  <column type="field" hidden="0" name="trenchlining" width="-1"/>
-                  <column type="field" hidden="0" name="m3exc_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m3fill_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m3excess_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m2trenchl_cost" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="194" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="y_param"/>
+                  <column type="field" width="-1" hidden="0" name="b"/>
+                  <column type="field" width="-1" hidden="0" name="trenchlining"/>
+                  <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44690,34 +44250,34 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_users20180131084332505" name="Users catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres" name="Users catalog" layerid="cat_users20180131084332505">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="context">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="name"/>
-                <alias index="2" name="" field="context"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="context" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="name" width="-1"/>
-                  <column type="field" hidden="0" name="context" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="context"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>.</editform>
@@ -44741,51 +44301,51 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_work20160216122620842" name="Work catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres" name="Work catalog" layerid="cat_work20160216122620842">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="workid_key1">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="workid_key2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="0" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="0" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="builtdate">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
-                <alias index="3" name="" field="workid_key1"/>
-                <alias index="4" name="" field="workid_key2"/>
-                <alias index="5" name="" field="builtdate"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
+                <alias name="" field="workid_key1" index="3"/>
+                <alias name="" field="workid_key2" index="4"/>
+                <alias name="" field="builtdate" index="5"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="workid_key1" width="-1"/>
-                  <column type="field" hidden="0" name="workid_key2" width="-1"/>
-                  <column type="field" hidden="0" name="builtdate" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="workid_key1"/>
+                  <column type="field" width="-1" hidden="0" name="workid_key2"/>
+                  <column type="field" width="-1" hidden="0" name="builtdate"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -44828,34 +44388,34 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="ext_municipality20171204170633784" name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleFill" pass="0" locked="0">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleFill">
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -45012,69 +44572,69 @@ def my_form_open(dialog, layer, feature):
               <displayfield>name</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="-1" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="muni_id"/>
-                <alias index="1" name="" field="name"/>
-                <alias index="2" name="" field="observ"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="muni_id" width="-1"/>
-                  <column type="field" hidden="0" name="name" width="183"/>
-                  <column type="field" hidden="0" name="observ" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -45114,434 +44674,434 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_edit_dimensions20170628134034849" name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" symbol="0" scalemindenom="1" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 "/>
-                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" symbol="1" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2"/>
-                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" symbol="2" scalemindenom="600" scalemaxdenom="1600"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleLine" pass="0" locked="0">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleLine">
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@1">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@2">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@3">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                    <layer class="SimpleLine" pass="0" locked="0">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleLine">
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@1@1">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@1@2">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@1@3">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                    <layer class="SimpleLine" pass="0" locked="0">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleLine">
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
-                    <layer class="GeometryGenerator" pass="0" locked="0">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol type="line" clip_to_extent="1" alpha="1" name="@2@1">
-                        <layer class="SimpleLine" pass="0" locked="0">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <layer locked="0" pass="0" class="GeometryGenerator">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleLine">
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@2@2">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="GeometryGenerator" pass="0" locked="0">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol type="fill" clip_to_extent="1" alpha="1" name="@2@3">
-                        <layer class="SimpleFill" pass="0" locked="0">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                    <layer locked="0" pass="0" class="GeometryGenerator">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleFill">
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="GeometryGenerator" pass="0" locked="0">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol type="line" clip_to_extent="1" alpha="1" name="@2@4">
-                        <layer class="SimpleLine" pass="0" locked="0">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <layer locked="0" pass="0" class="GeometryGenerator">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleLine">
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -45550,143 +45110,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -45843,91 +45403,91 @@ def my_form_open(dialog, layer, feature):
               <displayfield>id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Etiqueta" fieldname=""/>
+                <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="0" zIndex="0" placement="2"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="distance"/>
-                <alias index="2" name="" field="depth"/>
-                <alias index="3" name="" field="x_label"/>
-                <alias index="4" name="" field="y_label"/>
-                <alias index="5" name="" field="rotation_label"/>
-                <alias index="6" name="" field="offset_label"/>
-                <alias index="7" name="" field="direction_arrow"/>
-                <alias index="8" name="" field="x_symbol"/>
-                <alias index="9" name="" field="y_symbol"/>
-                <alias index="10" name="" field="feature_id"/>
-                <alias index="11" name="" field="feature_type"/>
-                <alias index="12" name="" field="state"/>
-                <alias index="13" name="" field="expl_id"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="distance" width="-1"/>
-                  <column type="field" hidden="0" name="depth" width="-1"/>
-                  <column type="field" hidden="0" name="x_label" width="-1"/>
-                  <column type="field" hidden="0" name="y_label" width="-1"/>
-                  <column type="field" hidden="0" name="rotation_label" width="-1"/>
-                  <column type="field" hidden="0" name="offset_label" width="-1"/>
-                  <column type="field" hidden="0" name="direction_arrow" width="-1"/>
-                  <column type="field" hidden="0" name="x_symbol" width="-1"/>
-                  <column type="field" hidden="0" name="y_symbol" width="-1"/>
-                  <column type="field" hidden="0" name="feature_id" width="-1"/>
-                  <column type="field" hidden="0" name="feature_type" width="-1"/>
-                  <column type="field" hidden="0" name="state" width="-1"/>
-                  <column type="field" hidden="0" name="expl_id" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -45978,132 +45538,132 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_edit_samplepoint20170619120830016" name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="0" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" version="2.18.14" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="dma_id" Layer="v_edit_dma20180201085045064" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="id" Layer="value_state20160216123517266" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config display_format="yyyy-MM-dd" allow_null="1" constraintDescription="" labelOnTop="0" calendar_popup="1" fieldEditable="1" notNull="0" constraint="" field_format="yyyy-MM-dd"/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config display_format="yyyy-MM-dd" allow_null="1" constraintDescription="" labelOnTop="0" calendar_popup="1" fieldEditable="1" notNull="0" constraint="" field_format="yyyy-MM-dd"/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_work20160216122620842" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_work20160216122620842" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="muni_id" Layer="ext_municipality20171204170633784" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="id" Layer="ext_streetaxis20160528211138508" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraintDescription="" Value="postnumber" labelOnTop="0" Key="postnumber" Layer="ext_address20171204171433160" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="value_verified20160216164517266" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="expl_id" Layer="exploitation20180122152954062" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="marker" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleMarker" pass="0" locked="0">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleMarker">
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
-                    <layer class="FontMarker" pass="0" locked="0">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="FontMarker">
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -46260,83 +45820,83 @@ def my_form_open(dialog, layer, feature):
               <displayfield>sample_id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer upperHeight="50" lowerHeight="0" upperWidth="50" diagramType="Histogram" classificationAttributeExpression="" upperValue="0" attributeLegend="1" sizeLegend="0" lowerValue="0" lowerWidth="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="0" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="sample_id"/>
-                <alias index="1" name="" field="code"/>
-                <alias index="2" name="" field="lab_code"/>
-                <alias index="3" name="" field="feature_id"/>
-                <alias index="4" name="" field="featurecat_id"/>
-                <alias index="5" name="" field="dma_id"/>
-                <alias index="6" name="" field="macrodma_id"/>
-                <alias index="7" name="" field="presszonecat_id"/>
-                <alias index="8" name="" field="state"/>
-                <alias index="9" name="" field="builtdate"/>
-                <alias index="10" name="" field="enddate"/>
-                <alias index="11" name="" field="workcat_id"/>
-                <alias index="12" name="" field="workcat_id_end"/>
-                <alias index="13" name="" field="rotation"/>
-                <alias index="14" name="" field="muni_id"/>
-                <alias index="15" name="" field="streetaxis_id"/>
-                <alias index="16" name="" field="postnumber"/>
-                <alias index="17" name="" field="postcode"/>
-                <alias index="18" name="" field="streetaxis2_id"/>
-                <alias index="19" name="" field="postnumber2"/>
-                <alias index="20" name="" field="postcomplement"/>
-                <alias index="21" name="" field="postcomplement2"/>
-                <alias index="22" name="" field="place_name"/>
-                <alias index="23" name="" field="cabinet"/>
-                <alias index="24" name="" field="observations"/>
-                <alias index="25" name="" field="verified"/>
-                <alias index="26" name="" field="expl_id"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
@@ -46405,53 +45965,53 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_ext_address20180201103159332" name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="0" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="marker" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleMarker" pass="0" locked="0">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleMarker">
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -46607,77 +46167,77 @@ def my_form_open(dialog, layer, feature):
               <displayfield>id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="-1" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="muni_id"/>
-                <alias index="2" name="" field="postcode"/>
-                <alias index="3" name="" field="streetaxis_id"/>
-                <alias index="4" name="" field="postnumber"/>
-                <alias index="5" name="" field="plot_id"/>
-                <alias index="6" name="" field="expl_id"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="muni_id" width="-1"/>
-                  <column type="field" hidden="0" name="postcode" width="-1"/>
-                  <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-                  <column type="field" hidden="0" name="postnumber" width="-1"/>
-                  <column type="field" hidden="0" name="plot_id" width="-1"/>
-                  <column type="field" hidden="0" name="expl_id" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -46721,61 +46281,61 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_ext_plot20180201103159443" name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleFill" pass="0" locked="0">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleFill">
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -46931,68 +46491,68 @@ def my_form_open(dialog, layer, feature):
               <displayfield>id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="0" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="plot_code"/>
-                <alias index="2" name="" field="muni_id"/>
-                <alias index="3" name="" field="postcode"/>
-                <alias index="4" name="" field="streetaxis_id"/>
-                <alias index="5" name="" field="postnumber"/>
-                <alias index="6" name="" field="complement"/>
-                <alias index="7" name="" field="placement"/>
-                <alias index="8" name="" field="square"/>
-                <alias index="9" name="" field="observ"/>
-                <alias index="10" name="" field="text"/>
-                <alias index="11" name="" field="expl_id"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
@@ -47047,98 +46607,98 @@ def my_form_open(dialog, layer, feature):
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid maximumIntervalWidth="100" rightAnnotationDisplay="0" unit="0" gridFrameStyle="0" offsetX="0" intervalY="0" bottomAnnotationDirection="0" annotationPrecision="3" bottomAnnotationPosition="1" name="Cuadr�cula 1" annotationFormat="0" bottomFrameDivisions="0" frameFillColor1="255,255,255,255" rightFrameDivisions="0" bottomAnnotationDisplay="0" leftFrameDivisions="0" gridFrameMargin="0" intervalX="0" topAnnotationDirection="0" topAnnotationPosition="1" show="0" crossLength="3" minimumIntervalWidth="50" rightAnnotationPosition="1" annotationExpression="" gridFrameSideFlags="15" position="3" leftAnnotationPosition="1" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" showAnnotation="0" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFrameWidth="2" offsetY="0" blendMode="0" frameAnnotationDistance="1" gridStyle="0" annotationFontColor="0,0,0,255" frameFillColor2="0,0,0,255" gridFramePenThickness="0.5" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" topFrameDivisions="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" centered="0" inverted="0" position="3" show="1" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" name="Vista general 1" blendMode="0">
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -47146,610 +46706,610 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="16" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.1613,22.2695,mm" opacity="1" shapeType="1" positionLock="false" size="179.415,2.75637,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{04100234-7357-49e1-9d15-b7949d417719}" positionOnPage="17.1613,22.2695,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="15" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="40.013,223.173,mm" opacity="1" marginX="1" positionLock="false" size="149.138,11.1067,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% &quot;observ&quot; %]" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" marginY="1" positionOnPage="40.013,223.173,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="14" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="37.635,212.191,mm" opacity="1" marginX="1" positionLock="false" size="153.454,10.5555,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% &quot;descript&quot; %]" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" marginY="1" positionOnPage="37.635,212.191,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="13" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,191.26,mm" opacity="1" marginX="0" positionLock="false" size="77.862,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" marginY="0" positionOnPage="18.472,191.26,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="12" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.2394,224.173,mm" opacity="1" marginX="0" positionLock="false" size="24.3323,3.60837,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Observations:" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" marginY="0" positionOnPage="18.2394,224.173,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="11" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,184.169,mm" opacity="1" marginX="0" positionLock="false" size="63.839,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" marginY="0" positionOnPage="18.472,184.169,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem svgFillColor="0,0,0,255" pictureRotation="90" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" referencePoint="0" visibility="1" excludeFromExports="0" svgBorderColor="255,255,255,255" zValue="10" background="true" northMode="0" frame="false" resizeMode="0" svgBorderWidth="0" type="65640" outlineWidthM="0.3,mm" file="arrows/NorthArrow_10.svg" position="186.801,128.951,mm" opacity="1" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" positionLock="false" size="6.83615,6.83615,mm" groupUuid="" id="compass" itemRotation="0" frameJoinStyle="miter" anchorPoint="0" pictureHeight="6.83615" northOffset="0" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" positionOnPage="186.801,128.951,mm" blendMode="0" pictureWidth="5.27855">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="128" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="9" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,154.849,mm" opacity="1" marginX="0" positionLock="false" size="53.284,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total cost for arc elements:" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" marginY="0" positionOnPage="18.472,154.849,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="8" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.4712,213.104,mm" opacity="1" marginX="0" positionLock="false" size="20.5677,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Description:" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" marginY="0" positionOnPage="18.4712,213.104,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="7" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.4712,206.23,mm" opacity="1" marginX="0" positionLock="false" size="96.1108,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Priority:  [% &quot;priority&quot; %]" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" marginY="0" positionOnPage="18.4712,206.23,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="6" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.603,287.775,mm" opacity="1" shapeType="1" positionLock="false" size="179.614,0.746,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" positionOnPage="17.603,287.775,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" referencePoint="0" visibility="1" excludeFromExports="0" sectionY="0" zValue="5" background="false" frame="false" type="65647" outlineWidthM="0.3,mm" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" hideBackgroundIfEmpty="0" position="62.9048,188.347,mm" opacity="1" positionLock="false" size="44,6.16796,mm" groupUuid="" hidePageIfEmpty="0" id="" itemRotation="0" sectionWidth="44" frameJoinStyle="miter" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" positionOnPage="62.9048,188.347,mm" blendMode="0" sectionX="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" referencePoint="0" visibility="1" excludeFromExports="0" sectionY="0" zValue="4" background="false" frame="false" type="65647" outlineWidthM="0.3,mm" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" hideBackgroundIfEmpty="0" position="62.9048,182.447,mm" opacity="1" positionLock="false" size="44,5.9,mm" groupUuid="" hidePageIfEmpty="0" id="" itemRotation="0" sectionWidth="44" frameJoinStyle="miter" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" positionOnPage="62.9048,182.447,mm" blendMode="0" sectionX="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="3" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.7113,33.9068,mm" opacity="1" shapeType="1" positionLock="false" size="178.865,0.746323,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" positionOnPage="17.7113,33.9068,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="2" background="false" frame="true" type="65641" outlineWidthM="0.3,mm" position="85.0548,26.9871,mm" opacity="1" marginX="0" positionLock="false" size="49.4242,4.61973,mm" groupUuid="" id="title" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" marginY="0" positionOnPage="85.0548,26.9871,mm" blendMode="0" halign="4" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="1" background="true" labelMargin="0,mm" frame="true" type="65639" outlineWidthM="0.2,mm" followPreset="false" followPresetName="" position="18.572,40.2423,mm" opacity="1" positionLock="false" size="177.676,98.3225,mm" keepLayerSet="false" groupUuid="" id="map" itemRotation="0" frameJoinStyle="miter" drawCanvasItems="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" positionOnPage="18.572,40.2423,mm" blendMode="0" mapFlags="0" mapRotation="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapAtlasMargin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="&quot;rotation&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="&quot;scale&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="4576604.16589934565126896" xmin="419062.98866385139990598" xmax="419196.24566398735623807" ymax="4576677.90777442045509815"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid maximumIntervalWidth="100" rightAnnotationDisplay="0" unit="0" gridFrameStyle="0" offsetX="0" intervalY="0" bottomAnnotationDirection="0" annotationPrecision="3" bottomAnnotationPosition="1" name="Cuadr�cula 1" annotationFormat="0" bottomFrameDivisions="0" frameFillColor1="255,255,255,255" rightFrameDivisions="0" bottomAnnotationDisplay="0" leftFrameDivisions="0" gridFrameMargin="0" intervalX="0" topAnnotationDirection="0" topAnnotationPosition="1" show="0" crossLength="3" minimumIntervalWidth="50" rightAnnotationPosition="1" annotationExpression="" gridFrameSideFlags="15" position="3" leftAnnotationPosition="1" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" showAnnotation="0" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFrameWidth="2" offsetY="0" blendMode="0" frameAnnotationDistance="1" gridStyle="0" annotationFontColor="0,0,0,255" frameFillColor2="0,0,0,255" gridFramePenThickness="0.5" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" topFrameDivisions="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame wrapString="" emptyTableMessage="" relationId="" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" cellMargin="1" showUniqueRowsOnly="0" resizeMode="0" wrapBehavior="0" headerMode="2" emptyTableMode="0" type="65649" gridColor="0,0,0,255" showGrid="0" contentFontColor="0,0,0,255" headerHAlignment="3" source="0" verticalGrid="1" showOnlyVisibleFeatures="0" headerFontColor="0,0,0,255" maxFeatures="30" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" horizontalGrid="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterFeatures="false" featureFilter="" gridStrokeWidth="0.2" showEmptyRows="0">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_id" heading="psector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="name" heading="name">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_type" heading="psector_type">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="descript" heading="descript">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="priority" heading="priority">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_arc" heading="total_arc">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_node" heading="total_node">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_other" heading="total_other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text1" heading="text1">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text2" heading="text2">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="observ" heading="observ">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="rotation" heading="rotation">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="scale" heading="scale">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="sector_id" heading="sector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="active" heading="active">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pem" heading="pem">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="gexpenses" heading="gexpenses">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec" heading="pec">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="vat" heading="vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec_vat" heading="pec_vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="other" heading="other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pca" heading="pca">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame wrapString="" emptyTableMessage="" relationId="" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" cellMargin="1" showUniqueRowsOnly="0" resizeMode="0" wrapBehavior="0" headerMode="2" emptyTableMode="0" type="65649" gridColor="0,0,0,255" showGrid="0" contentFontColor="0,0,0,255" headerHAlignment="3" source="0" verticalGrid="1" showOnlyVisibleFeatures="0" headerFontColor="0,0,0,255" maxFeatures="30" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" horizontalGrid="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterFeatures="false" featureFilter="" gridStrokeWidth="0.5" showEmptyRows="0">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_id" heading="psector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="name" heading="name">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_type" heading="psector_type">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="descript" heading="descript">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="priority" heading="priority">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_arc" heading="total_arc">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_node" heading="total_node">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_other" heading="total_other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text1" heading="text1">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text2" heading="text2">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="observ" heading="observ">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="rotation" heading="rotation">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="scale" heading="scale">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="sector_id" heading="sector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="active" heading="active">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pem" heading="pem">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="gexpenses" heading="gexpenses">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec" heading="pec">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="vat" heading="vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec_vat" heading="pec_vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="other" heading="other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pca" heading="pca">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas coverageLayer="" enabled="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="" sortFeatures="1" filterFeatures="1" featureFilter=" &quot;psector_id&quot; " hideCoverage="1" sortKey="psector_id" sortAscending="1"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>
diff --git a/templates/qgisproject/en/ws_admin_sample.qgs b/templates/qgisproject/en/ws_admin_sample.qgs
index 7fdfc6877..593c11231 100644
--- a/templates/qgisproject/en/ws_admin_sample.qgs
+++ b/templates/qgisproject/en/ws_admin_sample.qgs
@@ -20,513 +20,513 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group checked="Qt::Checked" name="O&amp;M" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="O&amp;M">
       <customproperties/>
-      <layer-tree-layer checked="Qt::Unchecked" name="Visits" id="v_edit_om_visit20180201113951439" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" expanded="1">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_om_visit20180201113951439" name="Visits" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group checked="Qt::Checked" name="Mincut analysis" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Mincut analysis">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut init point" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" name="Mincut init point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result valve" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result node" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" name="Mincut result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result connec" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" name="Mincut result connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Mincut result valve" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="INVENTORY" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group checked="Qt::Checked" name="Map zones" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Exploitation" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Dma" id="v_edit_dma20190515092620863" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Sector" id="v_edit_sector20171204170540567" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Dqa" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Presszone" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Minsector" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Checked" name="Network" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-group checked="Qt::Checked" name="Child layers" expanded="1">
+        <layer-tree-group expanded="1" checked="Qt::Checked" name="Child layers">
           <customproperties/>
-          <layer-tree-group checked="Qt::Checked" name="Node GROUP" expanded="0">
+          <layer-tree-group expanded="0" checked="Qt::Checked" name="Node GROUP">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="Wtp" id="ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_wtp&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_wtp&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1" name="Wtp" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Source" id="ve_node_source_71ca7dec_99a1_4841_b714_98fd69ab991a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_source&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_source&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_source_71ca7dec_99a1_4841_b714_98fd69ab991a" name="Source" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Waterwell" id="ve_node_waterwell_1d0a69d4_0ed0_43fc_8ba5_f66d79053be8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_waterwell&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_waterwell&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_waterwell_1d0a69d4_0ed0_43fc_8ba5_f66d79053be8" name="Waterwell" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Tank" id="ve_node_tank_329ea188_43e1_4798_914d_8df784ce4d12" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_tank&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_tank_329ea188_43e1_4798_914d_8df784ce4d12" name="Tank" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Netsamplepoint" id="ve_node_netsamplepoint_0669ded4_347d_436d_8eef_c18dfde328a9" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_netsamplepoint&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_netsamplepoint&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_netsamplepoint_0669ded4_347d_436d_8eef_c18dfde328a9" name="Netsamplepoint" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Netelement" id="ve_node_netelement_d9dab27c_43ad_4d98_bad8_874425edaab3" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_netelement&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_netelement&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_netelement_d9dab27c_43ad_4d98_bad8_874425edaab3" name="Netelement" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Flexunion" id="ve_node_flexunion_a73197c5_a90f_4563_aa33_990f1e74da04" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_flexunion&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_flexunion&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_flexunion_a73197c5_a90f_4563_aa33_990f1e74da04" name="Flexunion" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Expantank" id="ve_node_expantank_9ae7e5cf_a4e5_4466_8fd1_ffa479d6fca1" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_expantank&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_expantank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_expantank_9ae7e5cf_a4e5_4466_8fd1_ffa479d6fca1" name="Expantank" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Register" id="ve_node_register_de663a97_2ebb_495b_82d1_de742435a028" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_register&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_register_de663a97_2ebb_495b_82d1_de742435a028" name="Register" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Pump" id="ve_node_pump_9e7f32ed_36d9_4b54_8317_c48e38997897" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_pump&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_pump&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_pump_9e7f32ed_36d9_4b54_8317_c48e38997897" name="Pump" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Hydrant" id="ve_node_hydrant_770bbe1c_5969_466e_b467_7f59c87c6d7c" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_hydrant&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_hydrant&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_hydrant_770bbe1c_5969_466e_b467_7f59c87c6d7c" name="Hydrant" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-group checked="Qt::Checked" name="Meter" expanded="0">
+            <layer-tree-group expanded="0" checked="Qt::Checked" name="Meter">
               <customproperties/>
-              <layer-tree-layer checked="Qt::Checked" name="Pressure_meter" id="ve_node_pressure_meter_529d2c30_f79f_4cf5_a2ab_b7e1549ea651" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_pressure_meter&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_pressure_meter&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_pressure_meter_529d2c30_f79f_4cf5_a2ab_b7e1549ea651" name="Pressure_meter" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Flowmeter" id="ve_node_flowmeter_0965df54_4940_4a4a_a32b_5701209b1386" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_flowmeter&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_flowmeter&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_flowmeter_0965df54_4940_4a4a_a32b_5701209b1386" name="Flowmeter" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
             </layer-tree-group>
-            <layer-tree-layer checked="Qt::Checked" name="Reduction" id="ve_node_reduction_75f62ce8_2ccd_4c42_bbae_ba496ba96459" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_reduction&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_reduction&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_reduction_75f62ce8_2ccd_4c42_bbae_ba496ba96459" name="Reduction" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Filter" id="ve_node_filter_0833f8c8_6f7f_447c_bf5b_2d406d200a5b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_filter&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_filter&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_filter_0833f8c8_6f7f_447c_bf5b_2d406d200a5b" name="Filter" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Manhole" id="ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_manhole&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_manhole&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce" name="Manhole" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-group checked="Qt::Checked" name="Valve" expanded="0">
+            <layer-tree-group expanded="0" checked="Qt::Checked" name="Valve">
               <customproperties/>
-              <layer-tree-layer checked="Qt::Checked" name="Air_valve" id="ve_node_air_valve_1521c3b0_3b61_4f5e_b453_73205e5d155e" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_air_valve&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_air_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_air_valve_1521c3b0_3b61_4f5e_b453_73205e5d155e" name="Air_valve" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Check_valve" id="ve_node_check_valve_38980ae0_8d83_402f_9133_16967078df3a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_check_valve&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_check_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_check_valve_38980ae0_8d83_402f_9133_16967078df3a" name="Check_valve" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Green_valve" id="ve_node_green_valve_dc39bae0_fe73_4175_9b56_215d735ffe72" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_green_valve&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_green_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_green_valve_dc39bae0_fe73_4175_9b56_215d735ffe72" name="Green_valve" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Outfall_valve" id="ve_node_outfall_valve_d751f455_864e_4fa2_8496_18feddb3504f" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_outfall_valve&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_outfall_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_outfall_valve_d751f455_864e_4fa2_8496_18feddb3504f" name="Outfall_valve" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Pr_reduc_valve" id="ve_node_pr_reduc_valve_2f6d646e_b3e3_4bf8_839d_eafbfb7dce55" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_pr_reduc_valve&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_pr_reduc_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_pr_reduc_valve_2f6d646e_b3e3_4bf8_839d_eafbfb7dce55" name="Pr_reduc_valve" providerKey="postgres">
                 <customproperties>
                   <property key="showFeatureCount" value="0"/>
                 </customproperties>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Shutoff_valve" id="ve_node_shutoff_valve_70237c68_e744_4fa5_8d02_b3c7854592eb" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_shutoff_valve&quot; (the_geom) sql=" expanded="0">
+              <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_shutoff_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_shutoff_valve_70237c68_e744_4fa5_8d02_b3c7854592eb" name="Shutoff_valve" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
             </layer-tree-group>
-            <layer-tree-group checked="Qt::Checked" name="Junction" expanded="0">
+            <layer-tree-group expanded="0" checked="Qt::Checked" name="Junction">
               <customproperties/>
-              <layer-tree-layer checked="Qt::Checked" name="Curve" id="ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_curve&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_curve&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3" name="Curve" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="End_line" id="ve_node_endline_3ae61f49_6ec8_466f_b62f_55c6384596cf" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_endline&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_endline&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_endline_3ae61f49_6ec8_466f_b62f_55c6384596cf" name="End_line" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="Junction" id="ve_node_junction_d15de399_7ec1_4986_9dcd_9c47d408c27e" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_junction&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_junction&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_junction_d15de399_7ec1_4986_9dcd_9c47d408c27e" name="Junction" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="T" id="ve_node_t_670cc15e_c7ec_4661_a9aa_8f182ee3ac2f" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_t&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_t&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_t_670cc15e_c7ec_4661_a9aa_8f182ee3ac2f" name="T" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
-              <layer-tree-layer checked="Qt::Checked" name="X" id="ve_node_x_f538d234_2579_4a10_8c39_e5dcca56c652" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_x&quot; (the_geom) sql=" expanded="1">
+              <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_x&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_x_f538d234_2579_4a10_8c39_e5dcca56c652" name="X" providerKey="postgres">
                 <customproperties/>
               </layer-tree-layer>
             </layer-tree-group>
-            <layer-tree-layer checked="Qt::Checked" name="Netwjoin" id="ve_node_water_connection_080b85a0_b3fb_49ef_a407_9296b87aae0b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_water_connection&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_node_water_connection&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_node_water_connection_080b85a0_b3fb_49ef_a407_9296b87aae0b" name="Netwjoin" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Arc GROUP" expanded="0">
+          <layer-tree-group expanded="0" checked="Qt::Checked" name="Arc GROUP">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="Pipe" id="ve_arc_pipe_135cdc2b_fd04_4c01_9fb2_4b4349d75e2b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_arc_pipe&quot; (the_geom) sql=" expanded="0">
+            <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_arc_pipe&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_arc_pipe_135cdc2b_fd04_4c01_9fb2_4b4349d75e2b" name="Pipe" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Varc" id="ve_arc_varc_0d855502_ce01_4cf0_922c_4a4d2fce031d" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_arc_varc&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_arc_varc&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_arc_varc_0d855502_ce01_4cf0_922c_4a4d2fce031d" name="Varc" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Connec GROUP" expanded="0">
+          <layer-tree-group expanded="0" checked="Qt::Checked" name="Connec GROUP">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="Fountain" id="ve_connec_fountain_a48937ab_2eae_457b_a13d_40cd8e738774" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_fountain&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_connec_fountain_a48937ab_2eae_457b_a13d_40cd8e738774" name="Fountain" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Greentap" id="ve_connec_greentap_b2893637_dd86_4289_ae2a_7779a79d4b03" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_greentap&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_greentap&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_connec_greentap_b2893637_dd86_4289_ae2a_7779a79d4b03" name="Greentap" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Tap" id="ve_connec_tap_4b578863_f932_4eb2_8456_9229aa2ae117" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_tap&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_tap&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_connec_tap_4b578863_f932_4eb2_8456_9229aa2ae117" name="Tap" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" name="Wjoin" id="ve_connec_wjoin_f654af46_7f09_4e7c_b825_08ae3034f40d" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_wjoin&quot; (the_geom) sql=" expanded="1">
+            <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_connec_wjoin&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_connec_wjoin_f654af46_7f09_4e7c_b825_08ae3034f40d" name="Wjoin" providerKey="postgres">
               <customproperties/>
             </layer-tree-layer>
           </layer-tree-group>
         </layer-tree-group>
-        <layer-tree-layer checked="Qt::Unchecked" name="Node" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Arc" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Connec" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Link" id="v_edit_link20160511142132204" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group checked="Qt::Checked" name="Polygon GROUP" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Fountain polygon" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Register polygon" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Tank polygon" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Checked" name="Other" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Dimensioning" id="v_edit_dimensions20170628134034849" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" expanded="0">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Element" id="v_edit_element20170828122555146" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Sample point" id="v_edit_samplepoint20170619120830016" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="EDIT" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EDIT">
       <customproperties/>
-      <layer-tree-group checked="Qt::Checked" name="CAD auxiliar layers" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="CAD auxiliar layers">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Circle" id="v_edit_cad_auxcircle20180403155702431" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" id="v_edit_cad_auxcircle20180403155702431" name="Circle" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Point" id="v_edit_cad_auxpoint20180403155702690" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" id="v_edit_cad_auxpoint20180403155702690" name="Point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="EPA" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EPA">
       <customproperties/>
-      <layer-tree-group checked="Qt::Unchecked" name="Input" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Input">
         <customproperties/>
-        <layer-tree-group checked="Qt::Unchecked" name="Node" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Node">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Inp reservoir" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" name="Inp reservoir" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp tank" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" name="Inp tank" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp inlet" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" name="Inp inlet" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp junction" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" name="Inp junction" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Inp mixing" id="inp_mixing20130813215615038" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" checked="Qt::Unchecked" id="inp_mixing20130813215615038" name="Inp mixing" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Inp emitter" id="inp_emitter20130813215614777" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" checked="Qt::Unchecked" id="inp_emitter20130813215614777" name="Inp emitter" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Inp source" id="inp_source20130813215615594" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" checked="Qt::Unchecked" id="inp_source20130813215615594" name="Inp source" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Demand scenario" id="v_edit_inp_demand20180212154336936" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" checked="Qt::Unchecked" id="v_edit_inp_demand20180212154336936" name="Demand scenario" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Arc" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Arc">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Inp virtualvalve" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" name="Inp virtualvalve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp shortpipe" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" name="Inp shortpipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp valve" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" name="Inp valve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp pump" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" name="Inp pump" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Inp pipe" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" name="Inp pipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Pump additional" id="inp_pump_additional20171218122636750" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" checked="Qt::Unchecked" id="inp_pump_additional20171218122636750" name="Pump additional" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Connec" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Connec">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Inp connec" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" name="Inp connec" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Controls &amp; Rules" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Controls &amp; Rules">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Unchecked" name="Controls arc" id="inp_controls_x_arc20180109103020152" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_controls_x_arc20180109103020152" name="Controls arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Rules arc" id="inp_rules_x_arc20180109103020214" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_arc20180109103020214" name="Rules arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Rules node" id="inp_rules_x_node20180109103020245" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_node20180109103020245" name="Rules node" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Curves &amp; Patterns" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Curves &amp; Patterns">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Curve catalog" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" checked="Qt::Checked" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" name="Curve catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Curve" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" checked="Qt::Checked" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" name="Curve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Patterns catalog" id="inp_pattern20130813215615249" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" checked="Qt::Unchecked" id="inp_pattern20130813215615249" name="Patterns catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Pattern" id="inp_pattern_value20180109135221371" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" checked="Qt::Unchecked" id="inp_pattern_value20180109135221371" name="Pattern" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Quality &amp; Energy" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Quality &amp; Energy">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Energy" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" checked="Qt::Checked" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" name="Energy" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Reactions" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" checked="Qt::Checked" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" name="Reactions" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Quality" id="inp_quality20130813215615383" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" checked="Qt::Unchecked" id="inp_quality20130813215615383" name="Quality" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Output" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Output">
         <customproperties/>
-        <layer-tree-group checked="Qt::Unchecked" name="Result" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Result">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node hourly values" id="v_rpt_node_hourly20180309112715024" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_hourly20180309112715024" name="Node hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node minimum values" id="v_rpt_node20180206173632034" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node20180206173632034" name="Node minimum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node maximum values" id="Node_minimum_values_copy20180206174011431" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="Node_minimum_values_copy20180206174011431" name="Node maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node all values" id="v_rpt_node_all20180309112714890" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_all20180309112714890" name="Node all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc hourly values" id="v_rpt_arc_hourly20180309112714378" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_hourly20180309112714378" name="Arc hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc maximum values" id="v_rpt_arc20180206173632206" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc20180206173632206" name="Arc maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc all values" id="v_rpt_arc_all20180309112714512" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_all20180309112714512" name="Arc all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Energy usage" id="v_rpt_energy_usage20180201122650430" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_energy_usage20180201122650430" name="Energy usage" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Hydraulic status" id="v_rpt_hydraulic_status20131203141738132" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_hydraulic_status20131203141738132" name="Hydraulic status" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group checked="Qt::Unchecked" name="Compare result" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Compare result">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node compare hourly values" id="v_rpt_comp_node_hourly20180309112714764" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_hourly20180309112714764" name="Node compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node minimum values compare" id="v_rpt_comp_node20160710012004695" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node20160710012004695" name="Node minimum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Node maximum values compare" id="v_rpt_comp_node_copiar20161230144859228" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_copiar20161230144859228" name="Node maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc compare hourly values" id="v_rpt_comp_arc_hourly20180309112714639" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc_hourly20180309112714639" name="Arc compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Arc maximum values compare" id="v_rpt_comp_arc20160710012004554" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" expanded="0">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc20160710012004554" name="Arc maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Energy usage compare" id="v_rpt_comp_energy_usage20160710012004617" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_energy_usage20160710012004617" name="Energy usage compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Unchecked" name="Hydraulic status compare" id="v_rpt_comp_hydraulic_status20160710012004648" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" expanded="1">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_hydraulic_status20160710012004648" name="Hydraulic status compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="MASTERPLAN" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="MASTERPLAN">
       <customproperties/>
-      <layer-tree-group checked="Qt::Unchecked" name="Network value" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Network value">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Unchecked" name="Plan result node" id="v_plan_result_node20180112102743460" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_node&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_plan_result_node20180112102743460" name="Plan result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Plan result arc" id="v_plan_result_arc20180112102742726" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_arc&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_plan_result_arc20180112102742726" name="Plan result arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Arc x pavement" id="plan_arc_x_pavement20160710012151609" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;plan_arc_x_pavement&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;plan_arc_x_pavement&quot; sql=" checked="Qt::Unchecked" id="plan_arc_x_pavement20160710012151609" name="Arc x pavement" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Psectors" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Psectors">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Unchecked" name="Plan psector" id="v_edit_plan_psector20170627152846650" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_plan_psector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_plan_psector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_plan_psector20170627152846650" name="Plan psector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Current psector" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_current_psector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_current_psector&quot; (the_geom) sql=" checked="Qt::Checked" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" name="Current psector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Prices" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Prices">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Prices" id="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price&quot; sql=" checked="Qt::Checked" id="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" name="Prices" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Compost prices" id="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price_compost&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price_compost&quot; sql=" checked="Qt::Checked" id="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" name="Compost prices" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="ADMIN" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="ADMIN">
       <customproperties/>
-      <layer-tree-group checked="Qt::Unchecked" name="Other Mapzones" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Other Mapzones">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Macroexploitation" id="macroexploitation20171207121804523" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macroexpl_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;macroexploitation&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macroexpl_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;macroexploitation&quot; sql=" checked="Qt::Checked" id="macroexploitation20171207121804523" name="Macroexploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Macrodma" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodma&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" name="Macrodma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Macrosector" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrosector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrosector&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrosector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrosector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" name="Macrosector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Macrodqa" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodqa&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_macrodqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" name="Macrodqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group checked="Qt::Unchecked" name="Catalogs" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Catalogs">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Node material catalog" id="cat_mat_node20160224165702530" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" checked="Qt::Checked" id="cat_mat_node20160224165702530" name="Node material catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Arc material catalog" id="cat_mat_arc20160224165702501" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" checked="Qt::Checked" id="cat_mat_arc20160224165702501" name="Arc material catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Node catalog" id="cat_node20151105202206790" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" checked="Qt::Checked" id="cat_node20151105202206790" name="Node catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Arc catalog" id="cat_arc20151120192002466" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" checked="Qt::Checked" id="cat_arc20151120192002466" name="Arc catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Roughness catalog" id="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_roughness&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_roughness&quot; sql=" checked="Qt::Checked" id="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" name="Roughness catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Connec catalog" id="cat_connec20160216122620764" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" checked="Qt::Checked" id="cat_connec20160216122620764" name="Connec catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Element material catalog" id="cat_mat_element20160224165702516" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" checked="Qt::Checked" id="cat_mat_element20160224165702516" name="Element material catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Element catalog" id="cat_element20160224165938446" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" checked="Qt::Checked" id="cat_element20160224165938446" name="Element catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Owner catalog" id="cat_owner20160224165938429" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" checked="Qt::Checked" id="cat_owner20160224165938429" name="Owner catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Soil catalog" id="cat_soil20151105202206837" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" checked="Qt::Checked" id="cat_soil20151105202206837" name="Soil catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Pavement catalog" id="cat_pavement20170111155456255" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" checked="Qt::Checked" id="cat_pavement20170111155456255" name="Pavement catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Work catalog" id="cat_work20160216122620842" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" checked="Qt::Checked" id="cat_work20160216122620842" name="Work catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Builder catalog" id="cat_builder20160216122620733" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" checked="Qt::Checked" id="cat_builder20160216122620733" name="Builder catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Brand model catalog" id="cat_brand_model20180131084332427" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" checked="Qt::Checked" id="cat_brand_model20180131084332427" name="Brand model catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Brand catalog" id="cat_brand20180131084235586" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" checked="Qt::Checked" id="cat_brand20180131084235586" name="Brand catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Users catalog" id="cat_users20180131084332505" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" checked="Qt::Checked" id="cat_users20180131084332505" name="Users catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Period catalog" id="ext_cat_period20160703033754677" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_period&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_period&quot; sql=" checked="Qt::Unchecked" id="ext_cat_period20160703033754677" name="Period catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Hydrometer catalog" id="ext_cat_hydrometer20160703033754739" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_hydrometer&quot; sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_cat_hydrometer&quot; sql=" checked="Qt::Unchecked" id="ext_cat_hydrometer20160703033754739" name="Hydrometer catalog" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" name="Config Forms" id="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_config_sysfields&quot; sql=" expanded="1">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_config_sysfields&quot; sql=" checked="Qt::Checked" id="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" name="Config Forms" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="BASEMAP" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group checked="Qt::Checked" name="Address" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer checked="Qt::Checked" name="Municipality" id="ext_municipality20171204170633784" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" name="Address" id="v_ext_address20180201103159332" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Streetaxis" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Checked" name="Plot" id="v_ext_plot20180201103159443" providerKey="postgres" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" expanded="1">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -624,106 +624,105 @@
       <item>v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a</item>
       <item>v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3</item>
       <item>v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e</item>
-      <item>ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a</item>
     </custom-order>
   </layer-tree-group>
   <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_om_visit20180201113951439"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_arc_all20180309112714512"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_node_all20180309112714890"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_netelement_d9dab27c_43ad_4d98_bad8_874425edaab3"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_water_connection_080b85a0_b3fb_49ef_a407_9296b87aae0b"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_reduction_75f62ce8_2ccd_4c42_bbae_ba496ba96459"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_pr_reduc_valve_2f6d646e_b3e3_4bf8_839d_eafbfb7dce55"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_connec_tap_4b578863_f932_4eb2_8456_9229aa2ae117"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_filter_0833f8c8_6f7f_447c_bf5b_2d406d200a5b"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_flexunion_a73197c5_a90f_4563_aa33_990f1e74da04"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_pump_9e7f32ed_36d9_4b54_8317_c48e38997897"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_plan_result_node20180112102743460"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_flowmeter_0965df54_4940_4a4a_a32b_5701209b1386"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_netsamplepoint_0669ded4_347d_436d_8eef_c18dfde328a9"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_connec_fountain_a48937ab_2eae_457b_a13d_40cd8e738774"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_endline_3ae61f49_6ec8_466f_b62f_55c6384596cf"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_arc_hourly20180309112714378"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_t_670cc15e_c7ec_4661_a9aa_8f182ee3ac2f"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_arc_hourly20180309112714639"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_outfall_valve_d751f455_864e_4fa2_8496_18feddb3504f"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_green_valve_dc39bae0_fe73_4175_9b56_215d735ffe72"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_shutoff_valve_70237c68_e744_4fa5_8d02_b3c7854592eb"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_arc_varc_0d855502_ce01_4cf0_922c_4a4d2fce031d"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_register_de663a97_2ebb_495b_82d1_de742435a028"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_air_valve_1521c3b0_3b61_4f5e_b453_73205e5d155e"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_element20170828122555146"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_arc20160710012004554"/>
-      <layer-setting tolerance="1" type="1" units="0" enabled="1" id="v_edit_dimensions20170628134034849"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_node_copiar20161230144859228"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_source_71ca7dec_99a1_4841_b714_98fd69ab991a"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_arc_pipe_135cdc2b_fd04_4c01_9fb2_4b4349d75e2b"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_ext_plot20180201103159443"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_connec_wjoin_f654af46_7f09_4e7c_b825_08ae3034f40d"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_junction_d15de399_7ec1_4986_9dcd_9c47d408c27e"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_node_hourly20180309112715024"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_ext_address20180201103159332"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_check_valve_38980ae0_8d83_402f_9133_16967078df3a"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_arc20180206173632206"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b"/>
-      <layer-setting tolerance="1" type="1" units="0" enabled="1" id="ext_municipality20171204170633784"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_node20160710012004695"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_hydrant_770bbe1c_5969_466e_b467_7f59c87c6d7c"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_tank_329ea188_43e1_4798_914d_8df784ce4d12"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce"/>
-      <layer-setting tolerance="15" type="2" units="1" enabled="1" id="v_edit_link20160511142132204"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="Node_minimum_values_copy20180206174011431"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_sector20171204170540567"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_plan_result_arc20180112102742726"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_plan_psector20170627152846650"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_pressure_meter_529d2c30_f79f_4cf5_a2ab_b7e1549ea651"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_dma20190515092620863"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_connec_greentap_b2893637_dd86_4289_ae2a_7779a79d4b03"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_edit_samplepoint20170619120830016"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_waterwell_1d0a69d4_0ed0_43fc_8ba5_f66d79053be8"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_node20180206173632034"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_expantank_9ae7e5cf_a4e5_4466_8fd1_ffa479d6fca1"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee"/>
-      <layer-setting tolerance="15" type="1" units="1" enabled="1" id="v_rpt_comp_node_hourly20180309112714764"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="ve_node_x_f538d234_2579_4a10_8c39_e5dcca56c652"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca"/>
-      <layer-setting tolerance="12" type="1" units="1" enabled="0" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node20180206173632034" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_om_visit20180201113951439" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_plan_result_arc20180112102742726" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_hourly20180309112714764" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_air_valve_1521c3b0_3b61_4f5e_b453_73205e5d155e" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc20180206173632206" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_reduction_75f62ce8_2ccd_4c42_bbae_ba496ba96459" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_netsamplepoint_0669ded4_347d_436d_8eef_c18dfde328a9" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_expantank_9ae7e5cf_a4e5_4466_8fd1_ffa479d6fca1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_tank_329ea188_43e1_4798_914d_8df784ce4d12" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_all20180309112714512" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_junction_d15de399_7ec1_4986_9dcd_9c47d408c27e" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc20160710012004554" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_hourly20180309112715024" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_connec_greentap_b2893637_dd86_4289_ae2a_7779a79d4b03" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_pump_9e7f32ed_36d9_4b54_8317_c48e38997897" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_t_670cc15e_c7ec_4661_a9aa_8f182ee3ac2f" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_hourly20180309112714378" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_arc_varc_0d855502_ce01_4cf0_922c_4a4d2fce031d" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_arc_pipe_135cdc2b_fd04_4c01_9fb2_4b4349d75e2b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_water_connection_080b85a0_b3fb_49ef_a407_9296b87aae0b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_shutoff_valve_70237c68_e744_4fa5_8d02_b3c7854592eb" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_connec_tap_4b578863_f932_4eb2_8456_9229aa2ae117" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_register_de663a97_2ebb_495b_82d1_de742435a028" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="Node_minimum_values_copy20180206174011431" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_filter_0833f8c8_6f7f_447c_bf5b_2d406d200a5b" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node20160710012004695" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc_hourly20180309112714639" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_source_71ca7dec_99a1_4841_b714_98fd69ab991a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_x_f538d234_2579_4a10_8c39_e5dcca56c652" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_plan_result_node20180112102743460" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_hydrant_770bbe1c_5969_466e_b467_7f59c87c6d7c" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_all20180309112714890" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_flowmeter_0965df54_4940_4a4a_a32b_5701209b1386" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_pr_reduc_valve_2f6d646e_b3e3_4bf8_839d_eafbfb7dce55" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_connec_wjoin_f654af46_7f09_4e7c_b825_08ae3034f40d" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_netelement_d9dab27c_43ad_4d98_bad8_874425edaab3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_waterwell_1d0a69d4_0ed0_43fc_8ba5_f66d79053be8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_check_valve_38980ae0_8d83_402f_9133_16967078df3a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_outfall_valve_d751f455_864e_4fa2_8496_18feddb3504f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_pressure_meter_529d2c30_f79f_4cf5_a2ab_b7e1549ea651" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_flexunion_a73197c5_a90f_4563_aa33_990f1e74da04" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_plan_psector20170627152846650" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_green_valve_dc39bae0_fe73_4175_9b56_215d735ffe72" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_connec_fountain_a48937ab_2eae_457b_a13d_40cd8e738774" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_node_endline_3ae61f49_6ec8_466f_b62f_55c6384596cf" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_copiar20161230144859228" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>meters</units>
     <extent>
       <xmin>__XMIN__</xmin>
@@ -750,739 +749,739 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" checked="Qt::Checked" name="O&amp;M">
-      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Visits" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="v_edit_om_visit20180201113951439" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Checked" name="O&amp;M" open="false">
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Visits" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="v_edit_om_visit20180201113951439" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="false" checked="Qt::Checked" name="Mincut analysis">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut init point" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0" visible="1"/>
+      <legendgroup checked="Qt::Checked" name="Mincut analysis" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut init point" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Mincut result valve" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut result node" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result node" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut result connec" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result connec" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Mincut result valve" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="INVENTORY">
-      <legendgroup open="false" checked="Qt::Checked" name="Map zones">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Exploitation" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Dma" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_dma20190515092620863" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Sector" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_sector20171204170540567" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Dqa" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Presszone" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Minsector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" checked="Qt::Checked" name="Network">
-        <legendgroup open="true" checked="Qt::Checked" name="Child layers">
-          <legendgroup open="false" checked="Qt::Checked" name="Node GROUP">
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Wtp" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1" isInOverview="0" visible="1"/>
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendgroup checked="Qt::Checked" name="Child layers" open="true">
+          <legendgroup checked="Qt::Checked" name="Node GROUP" open="false">
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Wtp" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Source" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_source_71ca7dec_99a1_4841_b714_98fd69ab991a" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Source" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_source_71ca7dec_99a1_4841_b714_98fd69ab991a" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Waterwell" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_waterwell_1d0a69d4_0ed0_43fc_8ba5_f66d79053be8" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Waterwell" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_waterwell_1d0a69d4_0ed0_43fc_8ba5_f66d79053be8" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Tank" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_tank_329ea188_43e1_4798_914d_8df784ce4d12" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_tank_329ea188_43e1_4798_914d_8df784ce4d12" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Netsamplepoint" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_netsamplepoint_0669ded4_347d_436d_8eef_c18dfde328a9" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Netsamplepoint" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_netsamplepoint_0669ded4_347d_436d_8eef_c18dfde328a9" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Netelement" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_netelement_d9dab27c_43ad_4d98_bad8_874425edaab3" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Netelement" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_netelement_d9dab27c_43ad_4d98_bad8_874425edaab3" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Flexunion" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_flexunion_a73197c5_a90f_4563_aa33_990f1e74da04" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Flexunion" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_flexunion_a73197c5_a90f_4563_aa33_990f1e74da04" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Expantank" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_expantank_9ae7e5cf_a4e5_4466_8fd1_ffa479d6fca1" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Expantank" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_expantank_9ae7e5cf_a4e5_4466_8fd1_ffa479d6fca1" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Register" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_register_de663a97_2ebb_495b_82d1_de742435a028" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_register_de663a97_2ebb_495b_82d1_de742435a028" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Pump" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_pump_9e7f32ed_36d9_4b54_8317_c48e38997897" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Pump" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_pump_9e7f32ed_36d9_4b54_8317_c48e38997897" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Hydrant" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_hydrant_770bbe1c_5969_466e_b467_7f59c87c6d7c" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Hydrant" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_hydrant_770bbe1c_5969_466e_b467_7f59c87c6d7c" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendgroup open="false" checked="Qt::Checked" name="Meter">
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Pressure_meter" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_pressure_meter_529d2c30_f79f_4cf5_a2ab_b7e1549ea651" isInOverview="0" visible="1"/>
+            <legendgroup checked="Qt::Checked" name="Meter" open="false">
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Pressure_meter" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_pressure_meter_529d2c30_f79f_4cf5_a2ab_b7e1549ea651" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Flowmeter" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_flowmeter_0965df54_4940_4a4a_a32b_5701209b1386" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Flowmeter" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_flowmeter_0965df54_4940_4a4a_a32b_5701209b1386" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
             </legendgroup>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Reduction" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_reduction_75f62ce8_2ccd_4c42_bbae_ba496ba96459" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Reduction" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_reduction_75f62ce8_2ccd_4c42_bbae_ba496ba96459" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Filter" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_filter_0833f8c8_6f7f_447c_bf5b_2d406d200a5b" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Filter" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_filter_0833f8c8_6f7f_447c_bf5b_2d406d200a5b" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Manhole" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Manhole" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendgroup open="false" checked="Qt::Checked" name="Valve">
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Air_valve" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_air_valve_1521c3b0_3b61_4f5e_b453_73205e5d155e" isInOverview="0" visible="1"/>
+            <legendgroup checked="Qt::Checked" name="Valve" open="false">
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Air_valve" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_air_valve_1521c3b0_3b61_4f5e_b453_73205e5d155e" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Check_valve" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_check_valve_38980ae0_8d83_402f_9133_16967078df3a" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Check_valve" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_check_valve_38980ae0_8d83_402f_9133_16967078df3a" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Green_valve" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_green_valve_dc39bae0_fe73_4175_9b56_215d735ffe72" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Green_valve" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_green_valve_dc39bae0_fe73_4175_9b56_215d735ffe72" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Outfall_valve" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_outfall_valve_d751f455_864e_4fa2_8496_18feddb3504f" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Outfall_valve" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_outfall_valve_d751f455_864e_4fa2_8496_18feddb3504f" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Pr_reduc_valve" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_pr_reduc_valve_2f6d646e_b3e3_4bf8_839d_eafbfb7dce55" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Pr_reduc_valve" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_pr_reduc_valve_2f6d646e_b3e3_4bf8_839d_eafbfb7dce55" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Shutoff_valve" drawingOrder="-1">
-                <filegroup open="false" hidden="false">
-                  <legendlayerfile layerid="ve_node_shutoff_valve_70237c68_e744_4fa5_8d02_b3c7854592eb" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Shutoff_valve" open="false">
+                <filegroup hidden="false" open="false">
+                  <legendlayerfile visible="1" layerid="ve_node_shutoff_valve_70237c68_e744_4fa5_8d02_b3c7854592eb" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
             </legendgroup>
-            <legendgroup open="false" checked="Qt::Checked" name="Junction">
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Curve" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3" isInOverview="0" visible="1"/>
+            <legendgroup checked="Qt::Checked" name="Junction" open="false">
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="End_line" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_endline_3ae61f49_6ec8_466f_b62f_55c6384596cf" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="End_line" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_endline_3ae61f49_6ec8_466f_b62f_55c6384596cf" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Junction" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_junction_d15de399_7ec1_4986_9dcd_9c47d408c27e" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Junction" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_junction_d15de399_7ec1_4986_9dcd_9c47d408c27e" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="T" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_t_670cc15e_c7ec_4661_a9aa_8f182ee3ac2f" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="T" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_t_670cc15e_c7ec_4661_a9aa_8f182ee3ac2f" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
-              <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="X" drawingOrder="-1">
-                <filegroup open="true" hidden="false">
-                  <legendlayerfile layerid="ve_node_x_f538d234_2579_4a10_8c39_e5dcca56c652" isInOverview="0" visible="1"/>
+              <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="X" open="true">
+                <filegroup hidden="false" open="true">
+                  <legendlayerfile visible="1" layerid="ve_node_x_f538d234_2579_4a10_8c39_e5dcca56c652" isInOverview="0"/>
                 </filegroup>
               </legendlayer>
             </legendgroup>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Netwjoin" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_node_water_connection_080b85a0_b3fb_49ef_a407_9296b87aae0b" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Netwjoin" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_node_water_connection_080b85a0_b3fb_49ef_a407_9296b87aae0b" isInOverview="0"/>
               </filegroup>
             </legendlayer>
           </legendgroup>
-          <legendgroup open="false" checked="Qt::Checked" name="Arc GROUP">
-            <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Pipe" drawingOrder="-1">
-              <filegroup open="false" hidden="false">
-                <legendlayerfile layerid="ve_arc_pipe_135cdc2b_fd04_4c01_9fb2_4b4349d75e2b" isInOverview="0" visible="1"/>
+          <legendgroup checked="Qt::Checked" name="Arc GROUP" open="false">
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Pipe" open="false">
+              <filegroup hidden="false" open="false">
+                <legendlayerfile visible="1" layerid="ve_arc_pipe_135cdc2b_fd04_4c01_9fb2_4b4349d75e2b" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Varc" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_arc_varc_0d855502_ce01_4cf0_922c_4a4d2fce031d" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Varc" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_arc_varc_0d855502_ce01_4cf0_922c_4a4d2fce031d" isInOverview="0"/>
               </filegroup>
             </legendlayer>
           </legendgroup>
-          <legendgroup open="false" checked="Qt::Checked" name="Connec GROUP">
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Fountain" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_connec_fountain_a48937ab_2eae_457b_a13d_40cd8e738774" isInOverview="0" visible="1"/>
+          <legendgroup checked="Qt::Checked" name="Connec GROUP" open="false">
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_connec_fountain_a48937ab_2eae_457b_a13d_40cd8e738774" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Greentap" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_connec_greentap_b2893637_dd86_4289_ae2a_7779a79d4b03" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Greentap" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_connec_greentap_b2893637_dd86_4289_ae2a_7779a79d4b03" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Tap" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_connec_tap_4b578863_f932_4eb2_8456_9229aa2ae117" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tap" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_connec_tap_4b578863_f932_4eb2_8456_9229aa2ae117" isInOverview="0"/>
               </filegroup>
             </legendlayer>
-            <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Wjoin" drawingOrder="-1">
-              <filegroup open="true" hidden="false">
-                <legendlayerfile layerid="ve_connec_wjoin_f654af46_7f09_4e7c_b825_08ae3034f40d" isInOverview="0" visible="1"/>
+            <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Wjoin" open="true">
+              <filegroup hidden="false" open="true">
+                <legendlayerfile visible="1" layerid="ve_connec_wjoin_f654af46_7f09_4e7c_b825_08ae3034f40d" isInOverview="0"/>
               </filegroup>
             </legendlayer>
           </legendgroup>
         </legendgroup>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Connec" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="0" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Link" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_link20160511142132204" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" checked="Qt::Checked" name="Polygon GROUP">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Fountain polygon" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0" visible="1"/>
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Register polygon" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0" visible="1"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Tank polygon" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0" visible="1"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" checked="Qt::Checked" name="Other">
-        <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" name="Dimensioning" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile layerid="v_edit_dimensions20170628134034849" isInOverview="0" visible="1"/>
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
+            <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Element" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_element20170828122555146" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Sample point" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_samplepoint20170619120830016" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="EDIT">
-      <legendgroup open="false" checked="Qt::Checked" name="CAD auxiliar layers">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Circle" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="EDIT" open="false">
+      <legendgroup checked="Qt::Checked" name="CAD auxiliar layers" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Circle" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Point" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Point" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="EPA">
-      <legendgroup open="true" checked="Qt::Unchecked" name="Input">
-        <legendgroup open="false" checked="Qt::Unchecked" name="Node">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp reservoir" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="EPA" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Input" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Node" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp reservoir" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp tank" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp tank" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp inlet" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp inlet" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp junction" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp junction" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Inp mixing" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_mixing20130813215615038" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp mixing" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_mixing20130813215615038" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Inp emitter" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_emitter20130813215614777" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp emitter" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_emitter20130813215614777" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Inp source" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_source20130813215615594" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp source" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_source20130813215615594" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Demand scenario" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_demand20180212154336936" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Demand scenario" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_demand20180212154336936" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Arc">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp virtualvalve" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Arc" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp virtualvalve" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp shortpipe" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp shortpipe" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp valve" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp valve" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp pump" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pump" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp pipe" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pipe" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Pump additional" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_pump_additional20171218122636750" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pump additional" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_pump_additional20171218122636750" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Connec">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Inp connec" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Connec" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp connec" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Controls &amp; Rules">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Controls arc" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_controls_x_arc20180109103020152" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Controls &amp; Rules" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Controls arc" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_controls_x_arc20180109103020152" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Rules arc" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_rules_x_arc20180109103020214" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules arc" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_rules_x_arc20180109103020214" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Rules node" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_rules_x_node20180109103020245" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules node" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_rules_x_node20180109103020245" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Curves &amp; Patterns">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Curve catalog" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Curves &amp; Patterns" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve catalog" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Curve" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Patterns catalog" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_pattern20130813215615249" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Patterns catalog" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_pattern20130813215615249" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Pattern" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_pattern_value20180109135221371" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pattern" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_pattern_value20180109135221371" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Quality &amp; Energy">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Energy" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Quality &amp; Energy" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Energy" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Reactions" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Reactions" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Quality" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="inp_quality20130813215615383" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Quality" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="inp_quality20130813215615383" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" checked="Qt::Unchecked" name="Output">
-        <legendgroup open="false" checked="Qt::Unchecked" name="Result">
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node hourly values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_node_hourly20180309112715024" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Output" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node hourly values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_node_hourly20180309112715024" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node minimum values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_node20180206173632034" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_node20180206173632034" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node maximum values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="Node_minimum_values_copy20180206174011431" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="Node_minimum_values_copy20180206174011431" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node all values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_node_all20180309112714890" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node all values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_node_all20180309112714890" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc hourly values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_arc_hourly20180309112714378" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc hourly values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_arc_hourly20180309112714378" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc maximum values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_arc20180206173632206" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_arc20180206173632206" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Arc all values" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_arc_all20180309112714512" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc all values" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_arc_all20180309112714512" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Energy usage" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_energy_usage20180201122650430" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_energy_usage20180201122650430" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Hydraulic status" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_hydraulic_status20131203141738132" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_hydraulic_status20131203141738132" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" checked="Qt::Unchecked" name="Compare result">
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Node compare hourly values" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_node_hourly20180309112714764" isInOverview="0" visible="0"/>
+        <legendgroup checked="Qt::Unchecked" name="Compare result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node compare hourly values" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_node_hourly20180309112714764" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node minimum values compare" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_node20160710012004695" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values compare" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_node20160710012004695" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Node maximum values compare" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_node_copiar20161230144859228" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_node_copiar20161230144859228" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc compare hourly values" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_arc_hourly20180309112714639" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc compare hourly values" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_arc_hourly20180309112714639" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" name="Arc maximum values compare" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_arc20160710012004554" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_arc20160710012004554" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Energy usage compare" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_energy_usage20160710012004617" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage compare" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_energy_usage20160710012004617" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Hydraulic status compare" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
-              <legendlayerfile layerid="v_rpt_comp_hydraulic_status20160710012004648" isInOverview="0" visible="0"/>
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status compare" open="true">
+            <filegroup hidden="false" open="true">
+              <legendlayerfile visible="0" layerid="v_rpt_comp_hydraulic_status20160710012004648" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="MASTERPLAN">
-      <legendgroup open="false" checked="Qt::Unchecked" name="Network value">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Plan result node" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_plan_result_node20180112102743460" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="MASTERPLAN" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Network value" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan result node" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_plan_result_node20180112102743460" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Plan result arc" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_plan_result_arc20180112102742726" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan result arc" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_plan_result_arc20180112102742726" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Arc x pavement" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="plan_arc_x_pavement20160710012151609" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc x pavement" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="plan_arc_x_pavement20160710012151609" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" checked="Qt::Unchecked" name="Psectors">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Plan psector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_plan_psector20170627152846650" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Psectors" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan psector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_plan_psector20170627152846650" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Current psector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Current psector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" checked="Qt::Unchecked" name="Prices">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Prices" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Prices" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Prices" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Compost prices" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Compost prices" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="ADMIN">
-      <legendgroup open="false" checked="Qt::Unchecked" name="Other Mapzones">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Macroexploitation" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="macroexploitation20171207121804523" isInOverview="0" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" name="ADMIN" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Other Mapzones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Macroexploitation" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="macroexploitation20171207121804523" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Macrodma" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Macrodma" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_macrodma_b1ff3063_c66d_4ae6_97ba_0c75f87b50f3" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Macrosector" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Macrosector" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_macrosector_51d988f2_9fed_45a4_971e_d06f66c8477e" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Macrodqa" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Macrodqa" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="false" checked="Qt::Unchecked" name="Catalogs">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Node material catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_node20160224165702530" isInOverview="0" visible="0"/>
+      <legendgroup checked="Qt::Unchecked" name="Catalogs" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node material catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_node20160224165702530" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Arc material catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_arc20160224165702501" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc material catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_arc20160224165702501" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Node catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_node20151105202206790" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_node20151105202206790" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Arc catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_arc20151120192002466" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_arc20151120192002466" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Roughness catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Roughness catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Connec catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_connec20160216122620764" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_connec20160216122620764" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Element material catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_mat_element20160224165702516" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Element material catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_mat_element20160224165702516" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Element catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_element20160224165938446" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Element catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_element20160224165938446" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Owner catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_owner20160224165938429" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Owner catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_owner20160224165938429" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Soil catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_soil20151105202206837" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Soil catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_soil20151105202206837" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Pavement catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_pavement20170111155456255" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Pavement catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_pavement20170111155456255" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Work catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_work20160216122620842" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Work catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_work20160216122620842" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Builder catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_builder20160216122620733" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Builder catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_builder20160216122620733" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Brand model catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_brand_model20180131084332427" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Brand model catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_brand_model20180131084332427" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Brand catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_brand20180131084235586" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Brand catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_brand20180131084235586" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Users catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="cat_users20180131084332505" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Users catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="cat_users20180131084332505" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Period catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="ext_cat_period20160703033754677" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Period catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="ext_cat_period20160703033754677" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Hydrometer catalog" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="ext_cat_hydrometer20160703033754739" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydrometer catalog" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="ext_cat_hydrometer20160703033754739" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Config Forms" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Config Forms" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Checked" name="BASEMAP">
-      <legendgroup open="true" checked="Qt::Checked" name="Address">
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Municipality" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="ext_municipality20171204170633784" isInOverview="1" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" name="Address" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_ext_address20180201103159332" isInOverview="0" visible="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Streetaxis" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" name="Plot" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="v_ext_plot20180201103159443" isInOverview="0" visible="1"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
@@ -1490,83 +1489,8 @@
   </legend>
   <mapViewDocks/>
   <mapViewDocks3D/>
-  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
-    <units>degrees</units>
-    <extent>
-      <xmin>__XMIN__</xmin>
-      <ymin>__YMIN__</ymin>
-      <xmax>__XMAX__</xmax>
-      <ymax>__YMAX__</ymax>
-    </extent>
-    <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>
-        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-        <srsid>3452</srsid>
-        <srid>4326</srid>
-        <authid>EPSG:4326</authid>
-        <description>WGS 84</description>
-        <projectionacronym>longlat</projectionacronym>
-        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
-      </spatialrefsys>
-    </destinationsrs>
-    <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
-  </mapcanvas>
-  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
-    <units>degrees</units>
-    <extent>
-      <xmin>__XMIN__</xmin>
-      <ymin>__YMIN__</ymin>
-      <xmax>__XMAX__</xmax>
-      <ymax>__YMAX__</ymax>
-    </extent>
-    <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>
-        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-        <srsid>3452</srsid>
-        <srid>4326</srid>
-        <authid>EPSG:4326</authid>
-        <description>WGS 84</description>
-        <projectionacronym>longlat</projectionacronym>
-        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
-      </spatialrefsys>
-    </destinationsrs>
-    <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
-  </mapcanvas>
-  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
-    <units>degrees</units>
-    <extent>
-      <xmin>__XMIN__</xmin>
-      <ymin>__YMIN__</ymin>
-      <xmax>__XMAX__</xmax>
-      <ymax>__YMAX__</ymax>
-    </extent>
-    <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>
-        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-        <srsid>3452</srsid>
-        <srid>4326</srid>
-        <authid>EPSG:4326</authid>
-        <description>WGS 84</description>
-        <projectionacronym>longlat</projectionacronym>
-        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
-      </spatialrefsys>
-    </destinationsrs>
-    <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
-  </mapcanvas>
   <projectlayers>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>Node_minimum_values_copy20180206174011431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -1606,7 +1530,7 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -1626,202 +1550,202 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -1829,49 +1753,49 @@
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -1883,28 +1807,28 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1913,8 +1837,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1923,8 +1847,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1933,8 +1857,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1943,8 +1867,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1953,8 +1877,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1963,8 +1887,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1980,8 +1904,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1997,8 +1921,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2014,8 +1938,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2029,81 +1953,81 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="node_type"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="elevation"/>
-        <alias index="5" name="" field="max_demand"/>
-        <alias index="6" name="" field="min_demand"/>
-        <alias index="7" name="" field="max_head"/>
-        <alias index="8" name="" field="min_head"/>
-        <alias index="9" name="" field="max_pressure"/>
-        <alias index="10" name="" field="min_pressure"/>
-        <alias index="11" name="" field="max_quality"/>
-        <alias index="12" name="" field="min_quality"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="node_type" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="elevation" name="" index="4"/>
+        <alias field="max_demand" name="" index="5"/>
+        <alias field="min_demand" name="" index="6"/>
+        <alias field="max_head" name="" index="7"/>
+        <alias field="min_head" name="" index="8"/>
+        <alias field="max_pressure" name="" index="9"/>
+        <alias field="min_pressure" name="" index="10"/>
+        <alias field="max_quality" name="" index="11"/>
+        <alias field="min_quality" name="" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2140,7 +2064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="-4.65661e-10" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="-4.65661e-10" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_arc20151120192002466</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_arc" sql=</datasource>
       <keywordList>
@@ -2189,11 +2113,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -2223,7 +2147,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2232,36 +2156,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="arctype_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="PIPE" name="PIPE"/>
-                  <Option type="QString" value="VARC" name="VARC"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="FC" name="Fiberconcret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="PE-HD" name="PE high density"/>
-                  <Option type="QString" value="PE-LD" name="PE low density"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2270,8 +2186,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2280,8 +2196,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2290,8 +2206,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2300,8 +2216,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2310,8 +2226,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2320,37 +2236,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2359,8 +2266,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2369,8 +2276,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2379,8 +2286,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2389,8 +2296,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2399,8 +2306,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2409,8 +2316,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2419,343 +2326,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_unit">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="kg" name="kg"/>
-                  <Option type="QString" value="m" name="m"/>
-                  <Option type="QString" value="m2" name="m2"/>
-                  <Option type="QString" value="m3" name="m3"/>
-                  <Option type="QString" value="pa" name="pa"/>
-                  <Option type="QString" value="t" name="t"/>
-                  <Option type="QString" value="u" name="u"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m2bottom_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3protec_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -2764,8 +2376,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -2774,182 +2386,185 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="shape">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CIRCULAR" name="CIRCULAR"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="arctype_id" field="arctype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="" field="pnom"/>
-        <alias index="4" name="" field="dnom"/>
-        <alias index="5" name="" field="dint"/>
-        <alias index="6" name="" field="dext"/>
-        <alias index="7" name="" field="descript"/>
-        <alias index="8" name="" field="link"/>
-        <alias index="9" name="brand" field="brand"/>
-        <alias index="10" name="model" field="model"/>
-        <alias index="11" name="" field="svg"/>
-        <alias index="12" name="" field="z1"/>
-        <alias index="13" name="" field="z2"/>
-        <alias index="14" name="" field="width"/>
-        <alias index="15" name="" field="area"/>
-        <alias index="16" name="" field="estimated_depth"/>
-        <alias index="17" name="" field="bulk"/>
-        <alias index="18" name="cost_unit" field="cost_unit"/>
-        <alias index="19" name="cost" field="cost"/>
-        <alias index="20" name="m2bottom_cost" field="m2bottom_cost"/>
-        <alias index="21" name="m3protec_cost" field="m3protec_cost"/>
-        <alias index="22" name="" field="active"/>
-        <alias index="23" name="" field="label"/>
-        <alias index="24" name="shape" field="shape"/>
-        <alias index="25" name="" field="acoeff"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="arctype_id" name="arctype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="pnom" name="" index="3"/>
+        <alias field="dnom" name="" index="4"/>
+        <alias field="dint" name="" index="5"/>
+        <alias field="dext" name="" index="6"/>
+        <alias field="descript" name="" index="7"/>
+        <alias field="link" name="" index="8"/>
+        <alias field="brand" name="brand" index="9"/>
+        <alias field="model" name="model" index="10"/>
+        <alias field="svg" name="" index="11"/>
+        <alias field="z1" name="" index="12"/>
+        <alias field="z2" name="" index="13"/>
+        <alias field="width" name="" index="14"/>
+        <alias field="area" name="" index="15"/>
+        <alias field="estimated_depth" name="" index="16"/>
+        <alias field="bulk" name="" index="17"/>
+        <alias field="cost_unit" name="cost_unit" index="18"/>
+        <alias field="cost" name="cost" index="19"/>
+        <alias field="m2bottom_cost" name="m2bottom_cost" index="20"/>
+        <alias field="m3protec_cost" name="m3protec_cost" index="21"/>
+        <alias field="active" name="" index="22"/>
+        <alias field="label" name="" index="23"/>
+        <alias field="shape" name="shape" index="24"/>
+        <alias field="acoeff" name="" index="25"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arctype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="pnom" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="dint" applyOnUpdate="0"/>
-        <default expression="" field="dext" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="z1" applyOnUpdate="0"/>
-        <default expression="" field="z2" applyOnUpdate="0"/>
-        <default expression="" field="width" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="estimated_depth" applyOnUpdate="0"/>
-        <default expression="" field="bulk" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="m2bottom_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3protec_cost" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="shape" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="pnom" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="dint" expression=""/>
+        <default applyOnUpdate="0" field="dext" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="z1" expression=""/>
+        <default applyOnUpdate="0" field="z2" expression=""/>
+        <default applyOnUpdate="0" field="width" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="estimated_depth" expression=""/>
+        <default applyOnUpdate="0" field="bulk" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="m2bottom_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="shape" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arctype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dint"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="width"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="estimated_depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="bulk"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2bottom_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3protec_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shape"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dint" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="width" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="area" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="estimated_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="bulk" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2bottom_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shape" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arctype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="pnom"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="dint"/>
-        <constraint desc="" exp="" field="dext"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="z1"/>
-        <constraint desc="" exp="" field="z2"/>
-        <constraint desc="" exp="" field="width"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="estimated_depth"/>
-        <constraint desc="" exp="" field="bulk"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="m2bottom_cost"/>
-        <constraint desc="" exp="" field="m3protec_cost"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="shape"/>
-        <constraint desc="" exp="" field="acoeff"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arctype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="pnom" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="dint" desc=""/>
+        <constraint exp="" field="dext" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="z1" desc=""/>
+        <constraint exp="" field="z2" desc=""/>
+        <constraint exp="" field="width" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="estimated_depth" desc=""/>
+        <constraint exp="" field="bulk" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="m2bottom_cost" desc=""/>
+        <constraint exp="" field="m3protec_cost" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="shape" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{bd2b7151-8197-40f6-a47f-4600e8e700a0}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{922ecae5-8ab4-480b-a7a9-c5c80cff4ee5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arctype_id" width="-1"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="pnom" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="dint" width="-1"/>
-          <column type="field" hidden="0" name="dext" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="159"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="148"/>
-          <column type="field" hidden="0" name="z1" width="-1"/>
-          <column type="field" hidden="0" name="z2" width="-1"/>
-          <column type="field" hidden="0" name="width" width="-1"/>
-          <column type="field" hidden="0" name="area" width="-1"/>
-          <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-          <column type="field" hidden="0" name="bulk" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="-1"/>
-          <column type="field" hidden="0" name="m2bottom_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3protec_cost" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="shape" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="pnom"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="dint"/>
+          <column type="field" width="-1" hidden="0" name="dext"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="159" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="148" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="z1"/>
+          <column type="field" width="-1" hidden="0" name="z2"/>
+          <column type="field" width="-1" hidden="0" name="width"/>
+          <column type="field" width="-1" hidden="0" name="area"/>
+          <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+          <column type="field" width="-1" hidden="0" name="bulk"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="shape"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2981,6 +2596,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
         <field name="active" editable="1"/>
         <field name="arctype_id" editable="1"/>
         <field name="area" editable="1"/>
@@ -3008,6 +2624,7 @@ def my_form_open(dialog, layer, feature):
         <field name="z2" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
         <field labelOnTop="0" name="active"/>
         <field labelOnTop="0" name="arctype_id"/>
         <field labelOnTop="0" name="area"/>
@@ -3038,7 +2655,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_brand20180131084235586</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_brand" sql=</datasource>
       <keywordList>
@@ -3078,7 +2695,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3099,7 +2716,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3115,8 +2732,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3130,35 +2747,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3183,7 +2800,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_brand_model20180131084332427</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_brand_model" sql=</datasource>
       <keywordList>
@@ -3210,6 +2827,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -3223,10 +2849,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -3243,28 +2877,32 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="catbrand_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3273,55 +2911,60 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="catbrand_id" field="catbrand_id"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="catbrand_id" name="catbrand_id" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="link" name="link" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="catbrand_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="catbrand_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="catbrand_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="catbrand_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="catbrand_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="catbrand_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="catbrand_id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="catbrand_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3333,7 +2976,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -3342,12 +3001,17 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
         <field name="link" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="catbrand_id"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="link"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_builder20160216122620733</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_builder" sql=</datasource>
       <keywordList>
@@ -3387,7 +3051,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3408,7 +3072,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3424,8 +3088,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3439,41 +3103,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{b3a4944a-b906-40e7-ad7a-032f91a9a469}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{b3a4944a-b906-40e7-ad7a-032f91a9a469}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3498,7 +3162,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_connec20160216122620764</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_connec" sql=</datasource>
       <keywordList>
@@ -3547,11 +3211,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -3580,7 +3244,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3589,39 +3253,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="connectype_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="FOUNTAIN" name="FOUNTAIN"/>
-                  <Option type="QString" value="GREENTAP" name="GREENTAP"/>
-                  <Option type="QString" value="TAP" name="TAP"/>
-                  <Option type="QString" value="VCONNEC" name="VCONNEC"/>
-                  <Option type="QString" value="WJOIN" name="WJOIN"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CC" name="Concret"/>
-                  <Option type="QString" value="FC" name="Fiberconcret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="FD-FD-PVC" name="Iron-Iron-PVC"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3630,8 +3283,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3640,8 +3293,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3650,8 +3303,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3660,8 +3313,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3670,8 +3323,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3680,362 +3333,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="svg">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_ut">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_ml">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_m3">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4044,8 +3403,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -4054,120 +3413,120 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="connectype_id" field="connectype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="pnom" field="pnom"/>
-        <alias index="4" name="dnom" field="dnom"/>
-        <alias index="5" name="dint" field="dint"/>
-        <alias index="6" name="dext" field="dext"/>
-        <alias index="7" name="descript" field="descript"/>
-        <alias index="8" name="link" field="link"/>
-        <alias index="9" name="brand" field="brand"/>
-        <alias index="10" name="model" field="model"/>
-        <alias index="11" name="svg" field="svg"/>
-        <alias index="12" name="cost_ut" field="cost_ut"/>
-        <alias index="13" name="cost_ml" field="cost_ml"/>
-        <alias index="14" name="cost_m3" field="cost_m3"/>
-        <alias index="15" name="active" field="active"/>
-        <alias index="16" name="label" field="label"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="connectype_id" name="connectype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="pnom" name="pnom" index="3"/>
+        <alias field="dnom" name="dnom" index="4"/>
+        <alias field="dint" name="dint" index="5"/>
+        <alias field="dext" name="dext" index="6"/>
+        <alias field="descript" name="descript" index="7"/>
+        <alias field="link" name="link" index="8"/>
+        <alias field="brand" name="brand" index="9"/>
+        <alias field="model" name="model" index="10"/>
+        <alias field="svg" name="svg" index="11"/>
+        <alias field="cost_ut" name="cost_ut" index="12"/>
+        <alias field="cost_ml" name="cost_ml" index="13"/>
+        <alias field="cost_m3" name="cost_m3" index="14"/>
+        <alias field="active" name="active" index="15"/>
+        <alias field="label" name="label" index="16"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="pnom" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="dint" applyOnUpdate="0"/>
-        <default expression="" field="dext" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="cost_ut" applyOnUpdate="0"/>
-        <default expression="" field="cost_ml" applyOnUpdate="0"/>
-        <default expression="" field="cost_m3" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="pnom" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="dint" expression=""/>
+        <default applyOnUpdate="0" field="dext" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="cost_ut" expression=""/>
+        <default applyOnUpdate="0" field="cost_ml" expression=""/>
+        <default applyOnUpdate="0" field="cost_m3" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dint"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_ut"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_ml"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_m3"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dint" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_ut" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_ml" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_m3" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="pnom"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="dint"/>
-        <constraint desc="" exp="" field="dext"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="cost_ut"/>
-        <constraint desc="" exp="" field="cost_ml"/>
-        <constraint desc="" exp="" field="cost_m3"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="label"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="pnom" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="dint" desc=""/>
+        <constraint exp="" field="dext" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="cost_ut" desc=""/>
+        <constraint exp="" field="cost_ml" desc=""/>
+        <constraint exp="" field="cost_m3" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="label" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{972bc6f0-7544-41c6-9dd5-798648a4c3cd}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{9b51f506-29f1-48fd-a506-f089b9aa881b}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="132"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="pnom" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="dint" width="-1"/>
-          <column type="field" hidden="0" name="dext" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="cost_ut" width="140"/>
-          <column type="field" hidden="0" name="cost_ml" width="-1"/>
-          <column type="field" hidden="0" name="cost_m3" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
+          <column type="field" width="132" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="pnom"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="dint"/>
+          <column type="field" width="-1" hidden="0" name="dext"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="140" hidden="0" name="cost_ut"/>
+          <column type="field" width="-1" hidden="0" name="cost_ml"/>
+          <column type="field" width="-1" hidden="0" name="cost_m3"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4240,7 +3599,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_element20160224165938446</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_element" sql=</datasource>
       <keywordList>
@@ -4289,11 +3648,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -4322,7 +3681,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4331,38 +3690,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementtype_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="COVER" name="COVER"/>
-                  <Option type="QString" value="MANHOLE" name="MANHOLE"/>
-                  <Option type="QString" value="PROTECT_BAND" name="PROTECT_BAND"/>
-                  <Option type="QString" value="REGISTER" name="REGISTER"/>
-                  <Option type="QString" value="STEP" name="STEP"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="BRICK+IRON" name="Brick and iron"/>
-                  <Option type="QString" value="CONCRET" name="Concret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4371,8 +3720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4381,8 +3730,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4391,44 +3740,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4437,8 +3780,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4447,90 +3790,135 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="geom1">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="geom2">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="isdoublegeom">
+          <editWidget type="CheckBox">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="elementtype_id" field="elementtype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="geometry" field="geometry"/>
-        <alias index="4" name="descript" field="descript"/>
-        <alias index="5" name="link" field="link"/>
-        <alias index="6" name="brand" field="brand"/>
-        <alias index="7" name="type" field="type"/>
-        <alias index="8" name="model" field="model"/>
-        <alias index="9" name="svg" field="svg"/>
-        <alias index="10" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="elementtype_id" name="elementtype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="geometry" name="geometry" index="3"/>
+        <alias field="descript" name="descript" index="4"/>
+        <alias field="link" name="link" index="5"/>
+        <alias field="brand" name="brand" index="6"/>
+        <alias field="type" name="type" index="7"/>
+        <alias field="model" name="model" index="8"/>
+        <alias field="svg" name="svg" index="9"/>
+        <alias field="active" name="active" index="10"/>
+        <alias field="geom1" name="" index="11"/>
+        <alias field="geom2" name="" index="12"/>
+        <alias field="isdoublegeom" name="" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="elementtype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="geometry" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="geometry" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="geom1" expression=""/>
+        <default applyOnUpdate="0" field="geom2" expression=""/>
+        <default applyOnUpdate="0" field="isdoublegeom" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elementtype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geometry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geometry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isdoublegeom" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="elementtype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="geometry"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="geometry" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="geom1" desc=""/>
+        <constraint exp="" field="geom2" desc=""/>
+        <constraint exp="" field="isdoublegeom" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{7fe24c5b-ce25-45fc-8efb-d2a220b33de3}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5b736c83-87a9-4860-a678-413de71f8ec5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="elementtype_id" width="-1"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="geometry" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="type" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="geometry"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="geom1"/>
+          <column type="field" width="-1" hidden="0" name="geom2"/>
+          <column type="field" width="-1" hidden="0" name="isdoublegeom"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4566,8 +3954,11 @@ def my_form_open(dialog, layer, feature):
         <field name="brand" editable="1"/>
         <field name="descript" editable="1"/>
         <field name="elementtype_id" editable="1"/>
+        <field name="geom1" editable="1"/>
+        <field name="geom2" editable="1"/>
         <field name="geometry" editable="1"/>
         <field name="id" editable="1"/>
+        <field name="isdoublegeom" editable="1"/>
         <field name="link" editable="1"/>
         <field name="matcat_id" editable="1"/>
         <field name="model" editable="1"/>
@@ -4579,8 +3970,11 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="brand"/>
         <field labelOnTop="0" name="descript"/>
         <field labelOnTop="0" name="elementtype_id"/>
+        <field labelOnTop="0" name="geom1"/>
+        <field labelOnTop="0" name="geom2"/>
         <field labelOnTop="0" name="geometry"/>
         <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="isdoublegeom"/>
         <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="matcat_id"/>
         <field labelOnTop="0" name="model"/>
@@ -4591,7 +3985,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_arc20160224165702501</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_arc" sql=</datasource>
       <keywordList>
@@ -4631,7 +4025,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4652,7 +4046,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4668,8 +4062,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4683,41 +4077,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{683581f4-e181-475e-9eeb-908337188d7c}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{683581f4-e181-475e-9eeb-908337188d7c}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4742,7 +4136,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_element20160224165702516</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_element" sql=</datasource>
       <keywordList>
@@ -4782,7 +4176,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4803,7 +4197,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4819,8 +4213,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4834,41 +4228,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{3168fb2f-03de-4dfe-be8a-cd5c9dc8b602}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{3168fb2f-03de-4dfe-be8a-cd5c9dc8b602}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="167"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="167" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4893,7 +4287,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_node20160224165702530</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_node" sql=</datasource>
       <keywordList>
@@ -4933,7 +4327,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4954,7 +4348,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4970,8 +4364,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4985,42 +4379,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{d9c904a6-1220-41c6-ae30-b39bc59ed216}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{d9c904a6-1220-41c6-ae30-b39bc59ed216}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5045,7 +4439,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."cat_mat_roughness" sql=</datasource>
       <keywordList>
@@ -5062,7 +4456,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -5085,7 +4479,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5106,7 +4500,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -5164,42 +4558,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="matcat_id"/>
-        <alias index="2" name="" field="period_id"/>
-        <alias index="3" name="" field="init_age"/>
-        <alias index="4" name="" field="end_age"/>
-        <alias index="5" name="" field="roughness"/>
-        <alias index="6" name="" field="descript"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="matcat_id" name="" index="1"/>
+        <alias field="period_id" name="" index="2"/>
+        <alias field="init_age" name="" index="3"/>
+        <alias field="end_age" name="" index="4"/>
+        <alias field="roughness" name="" index="5"/>
+        <alias field="descript" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="period_id" applyOnUpdate="0"/>
-        <default expression="" field="init_age" applyOnUpdate="0"/>
-        <default expression="" field="end_age" applyOnUpdate="0"/>
-        <default expression="" field="roughness" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="period_id" expression=""/>
+        <default applyOnUpdate="0" field="init_age" expression=""/>
+        <default applyOnUpdate="0" field="end_age" expression=""/>
+        <default applyOnUpdate="0" field="roughness" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="period_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="init_age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="end_age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="roughness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="period_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="init_age" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="end_age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="roughness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="period_id"/>
-        <constraint desc="" exp="" field="init_age"/>
-        <constraint desc="" exp="" field="end_age"/>
-        <constraint desc="" exp="" field="roughness"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="period_id" desc=""/>
+        <constraint exp="" field="init_age" desc=""/>
+        <constraint exp="" field="end_age" desc=""/>
+        <constraint exp="" field="roughness" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -5226,7 +4620,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_node20151105202206790</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_node" sql=</datasource>
       <keywordList>
@@ -5275,11 +4669,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -5309,7 +4703,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5318,73 +4712,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="nodetype_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ADAPTATION" name="ADAPTATION"/>
-                  <Option type="QString" value="AIR_VALVE" name="AIR_VALVE"/>
-                  <Option type="QString" value="BYPASS_REGISTER" name="BYPASS_REGISTER"/>
-                  <Option type="QString" value="CHECK_VALVE" name="CHECK_VALVE"/>
-                  <Option type="QString" value="CLORINATHOR" name="CLORINATHOR"/>
-                  <Option type="QString" value="CONTROL_REGISTER" name="CONTROL_REGISTER"/>
-                  <Option type="QString" value="CURVE" name="CURVE"/>
-                  <Option type="QString" value="ENDLINE" name="ENDLINE"/>
-                  <Option type="QString" value="EXPANTANK" name="EXPANTANK"/>
-                  <Option type="QString" value="FILTER" name="FILTER"/>
-                  <Option type="QString" value="FLEXUNION" name="FLEXUNION"/>
-                  <Option type="QString" value="FLOWMETER" name="FLOWMETER"/>
-                  <Option type="QString" value="FL_CONTR_VALVE" name="FL_CONTR_VALVE"/>
-                  <Option type="QString" value="GEN_PURP_VALVE" name="GEN_PURP_VALVE"/>
-                  <Option type="QString" value="GREEN_VALVE" name="GREEN_VALVE"/>
-                  <Option type="QString" value="HYDRANT" name="HYDRANT"/>
-                  <Option type="QString" value="JUNCTION" name="JUNCTION"/>
-                  <Option type="QString" value="MANHOLE" name="MANHOLE"/>
-                  <Option type="QString" value="NETELEMENT" name="NETELEMENT"/>
-                  <Option type="QString" value="NETSAMPLEPOINT" name="NETSAMPLEPOINT"/>
-                  <Option type="QString" value="OUTFALL_VALVE" name="OUTFALL_VALVE"/>
-                  <Option type="QString" value="PRESSURE_METER" name="PRESSURE_METER"/>
-                  <Option type="QString" value="PR_BREAK_VALVE" name="PR_BREAK_VALVE"/>
-                  <Option type="QString" value="PR_REDUC_VALVE" name="PR_REDUC_VALVE"/>
-                  <Option type="QString" value="PR_SUSTA_VALVE" name="PR_SUSTA_VALVE"/>
-                  <Option type="QString" value="PUMP" name="PUMP"/>
-                  <Option type="QString" value="REDUCTION" name="REDUCTION"/>
-                  <Option type="QString" value="REGISTER" name="REGISTER"/>
-                  <Option type="QString" value="SHUTOFF_VALVE" name="SHUTOFF_VALVE"/>
-                  <Option type="QString" value="SOURCE" name="SOURCE"/>
-                  <Option type="QString" value="T" name="T"/>
-                  <Option type="QString" value="TANK" name="TANK"/>
-                  <Option type="QString" value="TAP" name="TAP"/>
-                  <Option type="QString" value="THROTTLE_VALVE" name="THROTTLE_VALVE"/>
-                  <Option type="QString" value="VALVE_REGISTER" name="VALVE_REGISTER"/>
-                  <Option type="QString" value="WATERWELL" name="WATERWELL"/>
-                  <Option type="QString" value="WATER_CONNECTION" name="WATER_CONNECTION"/>
-                  <Option type="QString" value="WTP" name="WTP"/>
-                  <Option type="QString" value="X" name="X"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="matcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CC" name="Concret"/>
-                  <Option type="QString" value="FC" name="Fiberconcret"/>
-                  <Option type="QString" value="FD" name="Iron"/>
-                  <Option type="QString" value="FD-FD-PVC" name="Iron-Iron-PVC"/>
-                  <Option type="QString" value="PVC" name="PVC"/>
-                  <Option type="QString" value="N/I" name="Unknown"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5393,8 +4742,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5403,8 +4752,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5413,8 +4762,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5423,16 +4772,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="shape">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -5440,8 +4792,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5450,45 +4802,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="brand">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="brand1" name="brand1"/>
-                  <Option type="QString" value="brand2" name="brand2"/>
-                  <Option type="QString" value="brand3" name="brand3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="model">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="model1" name="model1"/>
-                  <Option type="QString" value="model2" name="model2"/>
-                  <Option type="QString" value="model3" name="model3"/>
-                  <Option type="QString" value="model4" name="model4"/>
-                  <Option type="QString" value="model5" name="model5"/>
-                  <Option type="QString" value="model6" name="model6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="svg">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -5496,131 +4842,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost_unit">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="kg" name="kg"/>
-                  <Option type="QString" value="m" name="m"/>
-                  <Option type="QString" value="m2" name="m2"/>
-                  <Option type="QString" value="m3" name="m3"/>
-                  <Option type="QString" value="pa" name="pa"/>
-                  <Option type="QString" value="t" name="t"/>
-                  <Option type="QString" value="u" name="u"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5629,8 +4872,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="CheckBox">
             <config>
               <Option type="Map">
-                <Option type="QString" value="" name="CheckedState"/>
-                <Option type="QString" value="" name="UncheckedState"/>
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -5639,147 +4882,155 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ischange">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="nodetype_id" field="nodetype_id"/>
-        <alias index="2" name="matcat_id" field="matcat_id"/>
-        <alias index="3" name="pnom" field="pnom"/>
-        <alias index="4" name="dnom" field="dnom"/>
-        <alias index="5" name="dint" field="dint"/>
-        <alias index="6" name="dext" field="dext"/>
-        <alias index="7" name="shape" field="shape"/>
-        <alias index="8" name="descript" field="descript"/>
-        <alias index="9" name="link" field="link"/>
-        <alias index="10" name="brand" field="brand"/>
-        <alias index="11" name="model" field="model"/>
-        <alias index="12" name="svg" field="svg"/>
-        <alias index="13" name="estimated_depth" field="estimated_depth"/>
-        <alias index="14" name="cost_unit" field="cost_unit"/>
-        <alias index="15" name="cost" field="cost"/>
-        <alias index="16" name="active" field="active"/>
-        <alias index="17" name="label" field="label"/>
-        <alias index="18" name="ischange" field="ischange"/>
-        <alias index="19" name="" field="acoeff"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="nodetype_id" name="nodetype_id" index="1"/>
+        <alias field="matcat_id" name="matcat_id" index="2"/>
+        <alias field="pnom" name="pnom" index="3"/>
+        <alias field="dnom" name="dnom" index="4"/>
+        <alias field="dint" name="dint" index="5"/>
+        <alias field="dext" name="dext" index="6"/>
+        <alias field="shape" name="shape" index="7"/>
+        <alias field="descript" name="descript" index="8"/>
+        <alias field="link" name="link" index="9"/>
+        <alias field="brand" name="brand" index="10"/>
+        <alias field="model" name="model" index="11"/>
+        <alias field="svg" name="svg" index="12"/>
+        <alias field="estimated_depth" name="estimated_depth" index="13"/>
+        <alias field="cost_unit" name="cost_unit" index="14"/>
+        <alias field="cost" name="cost" index="15"/>
+        <alias field="active" name="active" index="16"/>
+        <alias field="label" name="label" index="17"/>
+        <alias field="ischange" name="ischange" index="18"/>
+        <alias field="acoeff" name="" index="19"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="pnom" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="dint" applyOnUpdate="0"/>
-        <default expression="" field="dext" applyOnUpdate="0"/>
-        <default expression="" field="shape" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="estimated_depth" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="ischange" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="pnom" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="dint" expression=""/>
+        <default applyOnUpdate="0" field="dext" expression=""/>
+        <default applyOnUpdate="0" field="shape" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="estimated_depth" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="ischange" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dint"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shape"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="estimated_depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ischange"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dint" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shape" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="estimated_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ischange" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="matcat_id"/>
-        <constraint desc="" exp="" field="pnom"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="dint"/>
-        <constraint desc="" exp="" field="dext"/>
-        <constraint desc="" exp="" field="shape"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="estimated_depth"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="ischange"/>
-        <constraint desc="" exp="" field="acoeff"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="matcat_id" desc=""/>
+        <constraint exp="" field="pnom" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="dint" desc=""/>
+        <constraint exp="" field="dext" desc=""/>
+        <constraint exp="" field="shape" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="estimated_depth" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="ischange" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5e532eda-2adf-49b1-810e-d1c3638f2389}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{9146de0d-51f8-4a54-95cf-0e97790df700}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="129"/>
-          <column type="field" hidden="0" name="nodetype_id" width="115"/>
-          <column type="field" hidden="0" name="matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="pnom" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="dint" width="-1"/>
-          <column type="field" hidden="0" name="dext" width="-1"/>
-          <column type="field" hidden="0" name="shape" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="104"/>
-          <column type="field" hidden="0" name="brand" width="-1"/>
-          <column type="field" hidden="0" name="model" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="115"/>
-          <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="156"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
+          <column type="field" width="129" hidden="0" name="id"/>
+          <column type="field" width="115" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="pnom"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="dint"/>
+          <column type="field" width="-1" hidden="0" name="dext"/>
+          <column type="field" width="-1" hidden="0" name="shape"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="104" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="brand"/>
+          <column type="field" width="-1" hidden="0" name="model"/>
+          <column type="field" width="115" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="156" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="ischange"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5811,6 +5062,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
         <field name="active" editable="1"/>
         <field name="brand" editable="1"/>
         <field name="cost" editable="1"/>
@@ -5832,6 +5084,7 @@ def my_form_open(dialog, layer, feature):
         <field name="svg" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
         <field labelOnTop="0" name="active"/>
         <field labelOnTop="0" name="brand"/>
         <field labelOnTop="0" name="cost"/>
@@ -5842,6 +5095,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="dnom"/>
         <field labelOnTop="0" name="estimated_depth"/>
         <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="ischange"/>
         <field labelOnTop="0" name="label"/>
         <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="matcat_id"/>
@@ -5855,7 +5109,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_owner20160224165938429</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_owner" sql=</datasource>
       <keywordList>
@@ -5895,7 +5149,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5916,7 +5170,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5932,8 +5186,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5947,42 +5201,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{338aec8f-1bd1-4d10-a1a4-128b5a49d09c}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{338aec8f-1bd1-4d10-a1a4-128b5a49d09c}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6007,7 +5261,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_pavement20170111155456255</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_pavement" sql=</datasource>
       <keywordList>
@@ -6034,6 +5288,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -6047,10 +5310,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -6067,8 +5338,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6077,8 +5352,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6087,8 +5362,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6097,8 +5372,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6107,159 +5382,65 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m2_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
-        <alias index="3" name="thickness" field="thickness"/>
-        <alias index="4" name="m2_cost" field="m2_cost"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
+        <alias field="thickness" name="thickness" index="3"/>
+        <alias field="m2_cost" name="m2_cost" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="thickness" applyOnUpdate="0"/>
-        <default expression="" field="m2_cost" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="thickness" expression=""/>
+        <default applyOnUpdate="0" field="m2_cost" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="thickness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2_cost"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="thickness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2_cost" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="thickness"/>
-        <constraint desc="" exp="" field="m2_cost"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="thickness" desc=""/>
+        <constraint exp="" field="m2_cost" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="thickness" width="-1"/>
-          <column type="field" hidden="0" name="m2_cost" width="121"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="thickness"/>
+          <column type="field" width="121" hidden="0" name="m2_cost"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6271,7 +5452,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -6281,12 +5478,18 @@ def my_form_open(dialog, layer, feature):
         <field name="m2_cost" editable="1"/>
         <field name="thickness" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="link"/>
+        <field labelOnTop="0" name="m2_cost"/>
+        <field labelOnTop="0" name="thickness"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_soil20151105202206837</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_soil" sql=</datasource>
       <keywordList>
@@ -6313,6 +5516,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -6326,10 +5538,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -6346,8 +5566,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6356,8 +5580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6366,8 +5590,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6376,16 +5600,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_param">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6393,8 +5620,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6403,508 +5630,125 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3exc_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3fill_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m3excess_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="m2trenchl_cost">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="A_FC110_PN10" name="A_FC110_PN10"/>
-                  <Option type="QString" value="A_FC160_PN10" name="A_FC160_PN10"/>
-                  <Option type="QString" value="A_FC63_PN10" name="A_FC63_PN10"/>
-                  <Option type="QString" value="A_FD150" name="A_FD150"/>
-                  <Option type="QString" value="A_FD200" name="A_FD200"/>
-                  <Option type="QString" value="A_PEHD110_PN16" name="A_PEHD110_PN16"/>
-                  <Option type="QString" value="A_PELD110_PN10" name="A_PELD110_PN10"/>
-                  <Option type="QString" value="A_PVC110_PN16" name="A_PVC110_PN16"/>
-                  <Option type="QString" value="A_PVC160_PN16" name="A_PVC160_PN16"/>
-                  <Option type="QString" value="A_PVC200_PN16" name="A_PVC200_PN16"/>
-                  <Option type="QString" value="A_PVC25_PN10" name="A_PVC25_PN10"/>
-                  <Option type="QString" value="A_PVC32_PN10" name="A_PVC32_PN10"/>
-                  <Option type="QString" value="A_PVC50_PN10" name="A_PVC50_PN10"/>
-                  <Option type="QString" value="A_PVC63_PN10" name="A_PVC63_PN10"/>
-                  <Option type="QString" value="A_PVC90_PN16" name="A_PVC90_PN16"/>
-                  <Option type="QString" value="F9265C51" name="F9265C51"/>
-                  <Option type="QString" value="F931201F" name="F931201F"/>
-                  <Option type="QString" value="F9E1311N" name="F9E1311N"/>
-                  <Option type="QString" value="F9G1A732" name="F9G1A732"/>
-                  <Option type="QString" value="F9H11251" name="F9H11251"/>
-                  <Option type="QString" value="F9H118E1" name="F9H118E1"/>
-                  <Option type="QString" value="F9J12X40" name="F9J12X40"/>
-                  <Option type="QString" value="F9J13Y40" name="F9J13Y40"/>
-                  <Option type="QString" value="N_AIRVAL_DN50" name="N_AIRVAL_DN50"/>
-                  <Option type="QString" value="N_CHKVAL100_PN10" name="N_CHKVAL100_PN10"/>
-                  <Option type="QString" value="N_CHKVAL150_PN10" name="N_CHKVAL150_PN10"/>
-                  <Option type="QString" value="N_CHKVAL200_PN10" name="N_CHKVAL200_PN10"/>
-                  <Option type="QString" value="N_CHKVAL300_PN10" name="N_CHKVAL300_PN10"/>
-                  <Option type="QString" value="N_CHKVAL63_PN10" name="N_CHKVAL63_PN10"/>
-                  <Option type="QString" value="N_CUR30_PVC110" name="N_CUR30_PVC110"/>
-                  <Option type="QString" value="N_CUR45_PVC110" name="N_CUR45_PVC110"/>
-                  <Option type="QString" value="N_ENDLINE" name="N_ENDLINE"/>
-                  <Option type="QString" value="N_ETAP" name="N_ETAP"/>
-                  <Option type="QString" value="N_EXPANTANK" name="N_EXPANTANK"/>
-                  <Option type="QString" value="N_FILTER-01" name="N_FILTER-01"/>
-                  <Option type="QString" value="N_FLEXUNION" name="N_FLEXUNION"/>
-                  <Option type="QString" value="N_FLOWMETER110" name="N_FLOWMETER110"/>
-                  <Option type="QString" value="N_FLOWMETER200" name="N_FLOWMETER200"/>
-                  <Option type="QString" value="N_GREVAL110_PN16" name="N_GREVAL110_PN16"/>
-                  <Option type="QString" value="N_GREVAL50_PN16" name="N_GREVAL50_PN16"/>
-                  <Option type="QString" value="N_GREVAL63_PN16" name="N_GREVAL63_PN16"/>
-                  <Option type="QString" value="N_HYD_1x100" name="N_HYD_1x100"/>
-                  <Option type="QString" value="N_HYD_1x110-2x63" name="N_HYD_1x110-2x63"/>
-                  <Option type="QString" value="N_JUN110" name="N_JUN110"/>
-                  <Option type="QString" value="N_JUN160" name="N_JUN160"/>
-                  <Option type="QString" value="N_JUN200" name="N_JUN200"/>
-                  <Option type="QString" value="N_JUN63" name="N_JUN63"/>
-                  <Option type="QString" value="N_JUNCT_CHNGMAT" name="N_JUNCT_CHNGMAT"/>
-                  <Option type="QString" value="N_NETELEMENT" name="N_NETELEMENT"/>
-                  <Option type="QString" value="N_NETSAMPLEP" name="N_NETSAMPLEP"/>
-                  <Option type="QString" value="N_OUTVAL-01" name="N_OUTVAL-01"/>
-                  <Option type="QString" value="N_PRESME110_PN16" name="N_PRESME110_PN16"/>
-                  <Option type="QString" value="N_PRESME200_PN16" name="N_PRESME200_PN16"/>
-                  <Option type="QString" value="N_PRVAL100_6/16" name="N_PRVAL100_6/16"/>
-                  <Option type="QString" value="N_PRVAL150_6/16" name="N_PRVAL150_6/16"/>
-                  <Option type="QString" value="N_PRVAL200_6/16" name="N_PRVAL200_6/16"/>
-                  <Option type="QString" value="N_PUMP-01" name="N_PUMP-01"/>
-                  <Option type="QString" value="N_REDUC_110-63" name="N_REDUC_110-63"/>
-                  <Option type="QString" value="N_REDUC_110-90" name="N_REDUC_110-90"/>
-                  <Option type="QString" value="N_REDUC_160-110" name="N_REDUC_160-110"/>
-                  <Option type="QString" value="N_REDUC_160-90" name="N_REDUC_160-90"/>
-                  <Option type="QString" value="N_REDUC_200-110" name="N_REDUC_200-110"/>
-                  <Option type="QString" value="N_REGISTER" name="N_REGISTER"/>
-                  <Option type="QString" value="N_SHTVAL110_PN16" name="N_SHTVAL110_PN16"/>
-                  <Option type="QString" value="N_SHTVAL160_PN16" name="N_SHTVAL160_PN16"/>
-                  <Option type="QString" value="N_SHTVAL63_PN16" name="N_SHTVAL63_PN16"/>
-                  <Option type="QString" value="N_SOURCE-01" name="N_SOURCE-01"/>
-                  <Option type="QString" value="N_T110-110_PN16" name="N_T110-110_PN16"/>
-                  <Option type="QString" value="N_T110-63_PN16" name="N_T110-63_PN16"/>
-                  <Option type="QString" value="N_T160-110-63" name="N_T160-110-63"/>
-                  <Option type="QString" value="N_T160-110_PN16" name="N_T160-110_PN16"/>
-                  <Option type="QString" value="N_T160-160_PN16" name="N_T160-160_PN16"/>
-                  <Option type="QString" value="N_T160-63_PN16" name="N_T160-63_PN16"/>
-                  <Option type="QString" value="N_T200-160_PN16" name="N_T200-160_PN16"/>
-                  <Option type="QString" value="N_T63-63-110" name="N_T63-63-110"/>
-                  <Option type="QString" value="N_T63-63_PN16" name="N_T63-63_PN16"/>
-                  <Option type="QString" value="N_TANK_30x10x3" name="N_TANK_30x10x3"/>
-                  <Option type="QString" value="N_WATER-CONNECT" name="N_WATER-CONNECT"/>
-                  <Option type="QString" value="N_WATERWELL-01" name="N_WATERWELL-01"/>
-                  <Option type="QString" value="N_XDN110-90_PN16" name="N_XDN110-90_PN16"/>
-                  <Option type="QString" value="N_XDN110_PN16" name="N_XDN110_PN16"/>
-                  <Option type="QString" value="PROTEC_SERVIS" name="PROTEC_SERVIS"/>
-                  <Option type="QString" value="P_ASPHALT-10" name="P_ASPHALT-10"/>
-                  <Option type="QString" value="P_CONCRETE-20" name="P_CONCRETE-20"/>
-                  <Option type="QString" value="P_SLAB-4P" name="P_SLAB-4P"/>
-                  <Option type="QString" value="SECURITY_HEALTH" name="SECURITY_HEALTH"/>
-                  <Option type="QString" value="S_EXC" name="S_EXC"/>
-                  <Option type="QString" value="S_NULL" name="S_NULL"/>
-                  <Option type="QString" value="S_REB" name="S_REB"/>
-                  <Option type="QString" value="S_REP" name="S_REP"/>
-                  <Option type="QString" value="S_TRANS" name="S_TRANS"/>
-                  <Option type="QString" value="S_TRENCH" name="S_TRENCH"/>
-                  <Option type="QString" value="VIRTUAL_M" name="VIRTUAL_M"/>
-                  <Option type="QString" value="VIRTUAL_M2" name="VIRTUAL_M2"/>
-                  <Option type="QString" value="VIRTUAL_M3" name="VIRTUAL_M3"/>
-                  <Option type="QString" value="VIRTUAL_U" name="VIRTUAL_U"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
-        <alias index="3" name="y_param" field="y_param"/>
-        <alias index="4" name="b" field="b"/>
-        <alias index="5" name="trenchlining" field="trenchlining"/>
-        <alias index="6" name="m3exc_cost" field="m3exc_cost"/>
-        <alias index="7" name="m3fill_cost" field="m3fill_cost"/>
-        <alias index="8" name="m3excess_cost" field="m3excess_cost"/>
-        <alias index="9" name="m2trenchl_cost" field="m2trenchl_cost"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
+        <alias field="y_param" name="y_param" index="3"/>
+        <alias field="b" name="b" index="4"/>
+        <alias field="trenchlining" name="trenchlining" index="5"/>
+        <alias field="m3exc_cost" name="m3exc_cost" index="6"/>
+        <alias field="m3fill_cost" name="m3fill_cost" index="7"/>
+        <alias field="m3excess_cost" name="m3excess_cost" index="8"/>
+        <alias field="m2trenchl_cost" name="m2trenchl_cost" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="y_param" applyOnUpdate="0"/>
-        <default expression="" field="b" applyOnUpdate="0"/>
-        <default expression="" field="trenchlining" applyOnUpdate="0"/>
-        <default expression="" field="m3exc_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3fill_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3excess_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2trenchl_cost" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="y_param" expression=""/>
+        <default applyOnUpdate="0" field="b" expression=""/>
+        <default applyOnUpdate="0" field="trenchlining" expression=""/>
+        <default applyOnUpdate="0" field="m3exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2trenchl_cost" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_param"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="b"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="trenchlining"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3exc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3fill_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3excess_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2trenchl_cost"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_param" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="b" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="trenchlining" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2trenchl_cost" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="y_param"/>
-        <constraint desc="" exp="" field="b"/>
-        <constraint desc="" exp="" field="trenchlining"/>
-        <constraint desc="" exp="" field="m3exc_cost"/>
-        <constraint desc="" exp="" field="m3fill_cost"/>
-        <constraint desc="" exp="" field="m3excess_cost"/>
-        <constraint desc="" exp="" field="m2trenchl_cost"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="y_param" desc=""/>
+        <constraint exp="" field="b" desc=""/>
+        <constraint exp="" field="trenchlining" desc=""/>
+        <constraint exp="" field="m3exc_cost" desc=""/>
+        <constraint exp="" field="m3fill_cost" desc=""/>
+        <constraint exp="" field="m3excess_cost" desc=""/>
+        <constraint exp="" field="m2trenchl_cost" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{eba1aa31-93aa-423b-aa40-3c018a5cd864}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{a675ab10-b45d-4a03-8a30-6a1f308af4e5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;m3fill_cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="194"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="y_param" width="-1"/>
-          <column type="field" hidden="0" name="b" width="-1"/>
-          <column type="field" hidden="0" name="trenchlining" width="-1"/>
-          <column type="field" hidden="0" name="m3exc_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3fill_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3excess_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2trenchl_cost" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="194" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="y_param"/>
+          <column type="field" width="-1" hidden="0" name="b"/>
+          <column type="field" width="-1" hidden="0" name="trenchlining"/>
+          <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6916,7 +5760,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -6931,12 +5791,23 @@ def my_form_open(dialog, layer, feature):
         <field name="trenchlining" editable="1"/>
         <field name="y_param" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="b"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="link"/>
+        <field labelOnTop="0" name="m2trenchl_cost"/>
+        <field labelOnTop="0" name="m3exc_cost"/>
+        <field labelOnTop="0" name="m3excess_cost"/>
+        <field labelOnTop="0" name="m3fill_cost"/>
+        <field labelOnTop="0" name="trenchlining"/>
+        <field labelOnTop="0" name="y_param"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_users20180131084332505</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_users" sql=</datasource>
       <keywordList>
@@ -6963,6 +5834,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -6976,10 +5856,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -6996,8 +5884,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7006,8 +5898,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7016,8 +5908,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7026,77 +5918,76 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sys_role">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="role_admin" name="role_admin"/>
-                  <Option type="QString" value="role_basic" name="role_basic"/>
-                  <Option type="QString" value="role_crm" name="role_crm"/>
-                  <Option type="QString" value="role_edit" name="role_edit"/>
-                  <Option type="QString" value="role_epa" name="role_epa"/>
-                  <Option type="QString" value="role_master" name="role_master"/>
-                  <Option type="QString" value="role_om" name="role_om"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="external">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="context" field="context"/>
-        <alias index="3" name="sys_role" field="sys_role"/>
-        <alias index="4" name="" field="active"/>
-        <alias index="5" name="" field="external"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="context" name="context" index="2"/>
+        <alias field="sys_role" name="sys_role" index="3"/>
+        <alias field="active" name="" index="4"/>
+        <alias field="external" name="" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="context" applyOnUpdate="0"/>
-        <default expression="" field="sys_role" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="external" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="context" expression=""/>
+        <default applyOnUpdate="0" field="sys_role" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="external" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="context"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_role"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="external"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="context" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_role" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="external" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="context"/>
-        <constraint desc="" exp="" field="sys_role"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="external"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="context" desc=""/>
+        <constraint exp="" field="sys_role" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="external" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -7104,10 +5995,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="context" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="context"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="sys_role"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="external"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7119,21 +6013,46 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="active" editable="1"/>
         <field name="context" editable="1"/>
+        <field name="external" editable="1"/>
         <field name="id" editable="1"/>
         <field name="name" editable="1"/>
         <field name="sys_role" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="active"/>
+        <field labelOnTop="0" name="context"/>
+        <field labelOnTop="0" name="external"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="sys_role"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>cat_work20160216122620842</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_work" sql=</datasource>
       <keywordList>
@@ -7173,7 +6092,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -7198,7 +6117,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7242,8 +6161,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7257,61 +6176,61 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
-        <alias index="2" name="link" field="link"/>
-        <alias index="3" name="workid_key1" field="workid_key1"/>
-        <alias index="4" name="workid_key2" field="workid_key2"/>
-        <alias index="5" name="builtdate" field="builtdate"/>
-        <alias index="6" name="" field="workcost"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
+        <alias field="link" name="link" index="2"/>
+        <alias field="workid_key1" name="workid_key1" index="3"/>
+        <alias field="workid_key2" name="workid_key2" index="4"/>
+        <alias field="builtdate" name="builtdate" index="5"/>
+        <alias field="workcost" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="workid_key1" applyOnUpdate="0"/>
-        <default expression="" field="workid_key2" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="workcost" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="workid_key1" expression=""/>
+        <default applyOnUpdate="0" field="workid_key2" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="workcost" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workid_key1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workid_key2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcost"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workid_key1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workid_key2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcost" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="workid_key1"/>
-        <constraint desc="" exp="" field="workid_key2"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="workcost"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="workid_key1" desc=""/>
+        <constraint exp="" field="workid_key2" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="workcost" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{8d093ce0-a598-4927-b014-7191ad5cab8c}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{8d093ce0-a598-4927-b014-7191ad5cab8c}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="workid_key1" width="-1"/>
-          <column type="field" hidden="0" name="workid_key2" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="workid_key1"/>
+          <column type="field" width="-1" hidden="0" name="workid_key2"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7355,7 +6274,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>ext_cat_hydrometer20160703033754739</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ext_cat_hydrometer" sql=</datasource>
       <shortname>ext_cat_hydrometer</shortname>
@@ -7396,7 +6315,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -7417,7 +6336,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7447,8 +6366,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7525,70 +6444,70 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="hydrometer_type" field="hydrometer_type"/>
-        <alias index="2" name="madeby" field="madeby"/>
-        <alias index="3" name="class" field="class"/>
-        <alias index="4" name="ulmc" field="ulmc"/>
-        <alias index="5" name="voltman_flow" field="voltman_flow"/>
-        <alias index="6" name="multi_jet_flow" field="multi_jet_flow"/>
-        <alias index="7" name="dnom" field="dnom"/>
-        <alias index="8" name="link" field="link"/>
-        <alias index="9" name="url" field="url"/>
-        <alias index="10" name="picture" field="picture"/>
-        <alias index="11" name="svg" field="svg"/>
-        <alias index="12" name="code" field="code"/>
-        <alias index="13" name="observ" field="observ"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="hydrometer_type" name="hydrometer_type" index="1"/>
+        <alias field="madeby" name="madeby" index="2"/>
+        <alias field="class" name="class" index="3"/>
+        <alias field="ulmc" name="ulmc" index="4"/>
+        <alias field="voltman_flow" name="voltman_flow" index="5"/>
+        <alias field="multi_jet_flow" name="multi_jet_flow" index="6"/>
+        <alias field="dnom" name="dnom" index="7"/>
+        <alias field="link" name="link" index="8"/>
+        <alias field="url" name="url" index="9"/>
+        <alias field="picture" name="picture" index="10"/>
+        <alias field="svg" name="svg" index="11"/>
+        <alias field="code" name="code" index="12"/>
+        <alias field="observ" name="observ" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="hydrometer_type" applyOnUpdate="0"/>
-        <default expression="" field="madeby" applyOnUpdate="0"/>
-        <default expression="" field="class" applyOnUpdate="0"/>
-        <default expression="" field="ulmc" applyOnUpdate="0"/>
-        <default expression="" field="voltman_flow" applyOnUpdate="0"/>
-        <default expression="" field="multi_jet_flow" applyOnUpdate="0"/>
-        <default expression="" field="dnom" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="url" applyOnUpdate="0"/>
-        <default expression="" field="picture" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="hydrometer_type" expression=""/>
+        <default applyOnUpdate="0" field="madeby" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="ulmc" expression=""/>
+        <default applyOnUpdate="0" field="voltman_flow" expression=""/>
+        <default applyOnUpdate="0" field="multi_jet_flow" expression=""/>
+        <default applyOnUpdate="0" field="dnom" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="url" expression=""/>
+        <default applyOnUpdate="0" field="picture" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hydrometer_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="madeby"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="class"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ulmc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="voltman_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="multi_jet_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="url"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="picture"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hydrometer_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="madeby" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ulmc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="voltman_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="multi_jet_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="url" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="picture" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="hydrometer_type"/>
-        <constraint desc="" exp="" field="madeby"/>
-        <constraint desc="" exp="" field="class"/>
-        <constraint desc="" exp="" field="ulmc"/>
-        <constraint desc="" exp="" field="voltman_flow"/>
-        <constraint desc="" exp="" field="multi_jet_flow"/>
-        <constraint desc="" exp="" field="dnom"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="url"/>
-        <constraint desc="" exp="" field="picture"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="observ"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="hydrometer_type" desc=""/>
+        <constraint exp="" field="madeby" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="ulmc" desc=""/>
+        <constraint exp="" field="voltman_flow" desc=""/>
+        <constraint exp="" field="multi_jet_flow" desc=""/>
+        <constraint exp="" field="dnom" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="url" desc=""/>
+        <constraint exp="" field="picture" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -7596,21 +6515,21 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="hydrometer_type" width="-1"/>
-          <column type="field" hidden="0" name="madeby" width="-1"/>
-          <column type="field" hidden="0" name="class" width="-1"/>
-          <column type="field" hidden="0" name="ulmc" width="-1"/>
-          <column type="field" hidden="0" name="voltman_flow" width="-1"/>
-          <column type="field" hidden="0" name="multi_jet_flow" width="-1"/>
-          <column type="field" hidden="0" name="dnom" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="url" width="-1"/>
-          <column type="field" hidden="0" name="picture" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="hydrometer_type"/>
+          <column type="field" width="-1" hidden="0" name="madeby"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="ulmc"/>
+          <column type="field" width="-1" hidden="0" name="voltman_flow"/>
+          <column type="field" width="-1" hidden="0" name="multi_jet_flow"/>
+          <column type="field" width="-1" hidden="0" name="dnom"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="url"/>
+          <column type="field" width="-1" hidden="0" name="picture"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7646,7 +6565,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>ext_cat_period20160703033754677</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ext_cat_period" sql=</datasource>
       <shortname>ext_cat_period</shortname>
@@ -7674,6 +6593,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -7687,10 +6615,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -7707,8 +6643,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7717,16 +6657,22 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="start_date">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7734,8 +6680,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7744,8 +6690,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7754,8 +6700,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7764,97 +6710,102 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="period_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="3" name="fall"/>
-                  <Option type="QString" value="1" name="spring"/>
-                  <Option type="QString" value="2" name="summer"/>
-                  <Option type="QString" value="4" name="winter"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="period_year">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="period_name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="start_date" field="start_date"/>
-        <alias index="2" name="end_date" field="end_date"/>
-        <alias index="3" name="period_seconds" field="period_seconds"/>
-        <alias index="4" name="comment" field="comment"/>
-        <alias index="5" name="code" field="code"/>
-        <alias index="6" name="period_type" field="period_type"/>
-        <alias index="7" name="period_year" field="period_year"/>
-        <alias index="8" name="period_name" field="period_name"/>
-        <alias index="9" name="expl_id" field="expl_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="start_date" name="start_date" index="1"/>
+        <alias field="end_date" name="end_date" index="2"/>
+        <alias field="period_seconds" name="period_seconds" index="3"/>
+        <alias field="comment" name="comment" index="4"/>
+        <alias field="code" name="code" index="5"/>
+        <alias field="period_type" name="period_type" index="6"/>
+        <alias field="period_year" name="period_year" index="7"/>
+        <alias field="period_name" name="period_name" index="8"/>
+        <alias field="expl_id" name="expl_id" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="start_date" applyOnUpdate="0"/>
-        <default expression="" field="end_date" applyOnUpdate="0"/>
-        <default expression="" field="period_seconds" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="period_type" applyOnUpdate="0"/>
-        <default expression="" field="period_year" applyOnUpdate="0"/>
-        <default expression="" field="period_name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="start_date" expression=""/>
+        <default applyOnUpdate="0" field="end_date" expression=""/>
+        <default applyOnUpdate="0" field="period_seconds" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="period_type" expression=""/>
+        <default applyOnUpdate="0" field="period_year" expression=""/>
+        <default applyOnUpdate="0" field="period_name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="start_date"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end_date"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_seconds"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_year"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="period_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="start_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="end_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_seconds" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_year" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="period_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="start_date"/>
-        <constraint desc="" exp="" field="end_date"/>
-        <constraint desc="" exp="" field="period_seconds"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="period_type"/>
-        <constraint desc="" exp="" field="period_year"/>
-        <constraint desc="" exp="" field="period_name"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="start_date" desc=""/>
+        <constraint exp="" field="end_date" desc=""/>
+        <constraint exp="" field="period_seconds" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="period_type" desc=""/>
+        <constraint exp="" field="period_year" desc=""/>
+        <constraint exp="" field="period_name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -7862,17 +6813,17 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="start_date" width="-1"/>
-          <column type="field" hidden="0" name="end_date" width="-1"/>
-          <column type="field" hidden="0" name="period_seconds" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="period_type" width="-1"/>
-          <column type="field" hidden="0" name="period_year" width="-1"/>
-          <column type="field" hidden="0" name="period_name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="start_date"/>
+          <column type="field" width="-1" hidden="0" name="end_date"/>
+          <column type="field" width="-1" hidden="0" name="period_seconds"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="period_type"/>
+          <column type="field" width="-1" hidden="0" name="period_year"/>
+          <column type="field" width="-1" hidden="0" name="period_name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7884,7 +6835,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -7899,12 +6866,23 @@ def my_form_open(dialog, layer, feature):
         <field name="period_year" editable="1"/>
         <field name="start_date" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="end_date"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="period_name"/>
+        <field labelOnTop="0" name="period_seconds"/>
+        <field labelOnTop="0" name="period_type"/>
+        <field labelOnTop="0" name="period_year"/>
+        <field labelOnTop="0" name="start_date"/>
+      </labelOnTop>
       <widgets/>
-      <previewExpression></previewExpression>
+      <previewExpression>period_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7959,11 +6937,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7987,26 +6965,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8023,86 +7001,98 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="muni_id" field="muni_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="observ" field="observ"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="muni_id" name="muni_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="observ" name="observ" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8110,11 +7100,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="183"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8161,7 +7151,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_controls_x_arc20180109103020152</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_controls_x_arc" sql=</datasource>
       <keywordList>
@@ -8201,7 +7191,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8222,7 +7212,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8257,39 +7247,39 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="text" field="text"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="text" name="text" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8315,7 +7305,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_383cb6c0_4452_42b4_a17d_131cca921196</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve" sql=</datasource>
       <keywordList>
@@ -8332,7 +7322,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -8355,7 +7345,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8376,7 +7366,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -8413,30 +7403,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="curve_type"/>
-        <alias index="2" name="" field="descript"/>
-        <alias index="3" name="" field="isdoublen2a"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="curve_type" name="" index="1"/>
+        <alias field="descript" name="" index="2"/>
+        <alias field="isdoublen2a" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="curve_type" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="isdoublen2a" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="isdoublen2a" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="curve_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="isdoublen2a"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isdoublen2a" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="curve_type"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="isdoublen2a"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="isdoublen2a" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8463,7 +7453,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve_value" sql=</datasource>
       <keywordList>
@@ -8480,7 +7470,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -8503,7 +7493,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8524,7 +7514,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -8561,30 +7551,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="curve_id"/>
-        <alias index="2" name="" field="x_value"/>
-        <alias index="3" name="" field="y_value"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="curve_id" name="" index="1"/>
+        <alias field="x_value" name="" index="2"/>
+        <alias field="y_value" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="x_value" applyOnUpdate="0"/>
-        <default expression="" field="y_value" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="x_value" expression=""/>
+        <default applyOnUpdate="0" field="y_value" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="x_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="y_value"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="x_value" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="y_value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="x_value"/>
-        <constraint desc="" exp="" field="y_value"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="x_value" desc=""/>
+        <constraint exp="" field="y_value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8611,7 +7601,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_emitter20130813215614777</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_emitter" sql=</datasource>
       <keywordList>
@@ -8651,7 +7641,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8672,7 +7662,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8688,44 +7678,44 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="coef" field="coef"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="coef" name="coef" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="coef" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="coef" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="coef"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="coef"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="coef" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="coef" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="coef"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8749,7 +7739,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_energy" sql=</datasource>
       <keywordList>
@@ -8766,7 +7756,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -8789,7 +7779,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8810,7 +7800,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -8833,22 +7823,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -8856,9 +7846,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8882,7 +7872,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_mixing20130813215615038</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_mixing" sql=</datasource>
       <keywordList>
@@ -8909,6 +7899,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8922,10 +7921,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -8947,7 +7954,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8956,70 +7963,70 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="mix_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="2COMP" name="2COMP"/>
-                  <Option type="QString" value="FIFO" name="FIFO"/>
-                  <Option type="QString" value="LIFO" name="LIFO"/>
-                  <Option type="QString" value="MIXED" name="MIXED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="value">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="mix_type" field="mix_type"/>
-        <alias index="2" name="value" field="value"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="mix_type" name="mix_type" index="1"/>
+        <alias field="value" name="value" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="mix_type" applyOnUpdate="0"/>
-        <default expression="" field="value" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="mix_type" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="mix_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="value"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mix_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="mix_type"/>
-        <constraint desc="" exp="" field="value"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="mix_type" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{090a6f21-21c8-42f5-9ee2-ac605342a7fa}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{48abc25e-d3b4-487c-84ec-7ac39610627f}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="mix_type" width="-1"/>
-          <column type="field" hidden="0" name="value" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="mix_type"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9055,12 +8062,16 @@ def my_form_open(dialog, layer, feature):
         <field name="node_id" editable="1"/>
         <field name="value" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="mix_type"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="value"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern20130813215615249</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern" sql=</datasource>
       <keywordList>
@@ -9109,11 +8120,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -9142,7 +8153,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9151,8 +8162,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9180,48 +8191,48 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="pattern_id" field="pattern_id"/>
-        <alias index="1" name="observ" field="observ"/>
-        <alias index="2" name="tscode" field="tscode"/>
-        <alias index="3" name="tsparameters" field="tsparameters"/>
+        <alias field="pattern_id" name="pattern_id" index="0"/>
+        <alias field="observ" name="observ" index="1"/>
+        <alias field="tscode" name="tscode" index="2"/>
+        <alias field="tsparameters" name="tsparameters" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="tscode" applyOnUpdate="0"/>
-        <default expression="" field="tsparameters" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="tscode" expression=""/>
+        <default applyOnUpdate="0" field="tsparameters" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tscode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tsparameters"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tscode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tsparameters" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="tscode"/>
-        <constraint desc="" exp="" field="tsparameters"/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="tscode" desc=""/>
+        <constraint exp="" field="tsparameters" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5e331a69-33a3-4cac-9657-c86880183ed4}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5e331a69-33a3-4cac-9657-c86880183ed4}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="pattern_type" width="-1"/>
-          <column type="field" hidden="0" name="tscode" width="-1"/>
-          <column type="field" hidden="0" name="tsparameters" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="pattern_type"/>
+          <column type="field" width="-1" hidden="0" name="tscode"/>
+          <column type="field" width="-1" hidden="0" name="tsparameters"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9270,7 +8281,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("pattern_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern_value20180109135221371</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern_value" sql=</datasource>
       <keywordList>
@@ -9297,6 +8308,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -9310,10 +8330,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -9335,161 +8363,188 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_3">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_4">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_5">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_6">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_7">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_8">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_9">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_10">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_11">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_12">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_13">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_14">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_15">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_16">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_17">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_18">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -9497,94 +8552,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="pattern_id" field="pattern_id"/>
-        <alias index="2" name="factor_1" field="factor_1"/>
-        <alias index="3" name="factor_2" field="factor_2"/>
-        <alias index="4" name="factor_3" field="factor_3"/>
-        <alias index="5" name="factor_4" field="factor_4"/>
-        <alias index="6" name="factor_5" field="factor_5"/>
-        <alias index="7" name="factor_6" field="factor_6"/>
-        <alias index="8" name="factor_7" field="factor_7"/>
-        <alias index="9" name="factor_8" field="factor_8"/>
-        <alias index="10" name="factor_9" field="factor_9"/>
-        <alias index="11" name="factor_10" field="factor_10"/>
-        <alias index="12" name="factor_11" field="factor_11"/>
-        <alias index="13" name="factor_12" field="factor_12"/>
-        <alias index="14" name="factor_13" field="factor_13"/>
-        <alias index="15" name="factor_14" field="factor_14"/>
-        <alias index="16" name="factor_15" field="factor_15"/>
-        <alias index="17" name="factor_16" field="factor_16"/>
-        <alias index="18" name="factor_17" field="factor_17"/>
-        <alias index="19" name="factor_18" field="factor_18"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="pattern_id" name="pattern_id" index="1"/>
+        <alias field="factor_1" name="factor_1" index="2"/>
+        <alias field="factor_2" name="factor_2" index="3"/>
+        <alias field="factor_3" name="factor_3" index="4"/>
+        <alias field="factor_4" name="factor_4" index="5"/>
+        <alias field="factor_5" name="factor_5" index="6"/>
+        <alias field="factor_6" name="factor_6" index="7"/>
+        <alias field="factor_7" name="factor_7" index="8"/>
+        <alias field="factor_8" name="factor_8" index="9"/>
+        <alias field="factor_9" name="factor_9" index="10"/>
+        <alias field="factor_10" name="factor_10" index="11"/>
+        <alias field="factor_11" name="factor_11" index="12"/>
+        <alias field="factor_12" name="factor_12" index="13"/>
+        <alias field="factor_13" name="factor_13" index="14"/>
+        <alias field="factor_14" name="factor_14" index="15"/>
+        <alias field="factor_15" name="factor_15" index="16"/>
+        <alias field="factor_16" name="factor_16" index="17"/>
+        <alias field="factor_17" name="factor_17" index="18"/>
+        <alias field="factor_18" name="factor_18" index="19"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="factor_1" applyOnUpdate="0"/>
-        <default expression="" field="factor_2" applyOnUpdate="0"/>
-        <default expression="" field="factor_3" applyOnUpdate="0"/>
-        <default expression="" field="factor_4" applyOnUpdate="0"/>
-        <default expression="" field="factor_5" applyOnUpdate="0"/>
-        <default expression="" field="factor_6" applyOnUpdate="0"/>
-        <default expression="" field="factor_7" applyOnUpdate="0"/>
-        <default expression="" field="factor_8" applyOnUpdate="0"/>
-        <default expression="" field="factor_9" applyOnUpdate="0"/>
-        <default expression="" field="factor_10" applyOnUpdate="0"/>
-        <default expression="" field="factor_11" applyOnUpdate="0"/>
-        <default expression="" field="factor_12" applyOnUpdate="0"/>
-        <default expression="" field="factor_13" applyOnUpdate="0"/>
-        <default expression="" field="factor_14" applyOnUpdate="0"/>
-        <default expression="" field="factor_15" applyOnUpdate="0"/>
-        <default expression="" field="factor_16" applyOnUpdate="0"/>
-        <default expression="" field="factor_17" applyOnUpdate="0"/>
-        <default expression="" field="factor_18" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="factor_1" expression=""/>
+        <default applyOnUpdate="0" field="factor_2" expression=""/>
+        <default applyOnUpdate="0" field="factor_3" expression=""/>
+        <default applyOnUpdate="0" field="factor_4" expression=""/>
+        <default applyOnUpdate="0" field="factor_5" expression=""/>
+        <default applyOnUpdate="0" field="factor_6" expression=""/>
+        <default applyOnUpdate="0" field="factor_7" expression=""/>
+        <default applyOnUpdate="0" field="factor_8" expression=""/>
+        <default applyOnUpdate="0" field="factor_9" expression=""/>
+        <default applyOnUpdate="0" field="factor_10" expression=""/>
+        <default applyOnUpdate="0" field="factor_11" expression=""/>
+        <default applyOnUpdate="0" field="factor_12" expression=""/>
+        <default applyOnUpdate="0" field="factor_13" expression=""/>
+        <default applyOnUpdate="0" field="factor_14" expression=""/>
+        <default applyOnUpdate="0" field="factor_15" expression=""/>
+        <default applyOnUpdate="0" field="factor_16" expression=""/>
+        <default applyOnUpdate="0" field="factor_17" expression=""/>
+        <default applyOnUpdate="0" field="factor_18" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_3"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_4"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_5"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_6"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_7"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_8"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_9"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_10"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_11"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_12"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_13"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_14"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_15"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_16"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_17"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="factor_18"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_3" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_4" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_5" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_6" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_7" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_8" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_9" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_10" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_11" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_12" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_13" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_14" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_15" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_16" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_17" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_18" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="factor_1"/>
-        <constraint desc="" exp="" field="factor_2"/>
-        <constraint desc="" exp="" field="factor_3"/>
-        <constraint desc="" exp="" field="factor_4"/>
-        <constraint desc="" exp="" field="factor_5"/>
-        <constraint desc="" exp="" field="factor_6"/>
-        <constraint desc="" exp="" field="factor_7"/>
-        <constraint desc="" exp="" field="factor_8"/>
-        <constraint desc="" exp="" field="factor_9"/>
-        <constraint desc="" exp="" field="factor_10"/>
-        <constraint desc="" exp="" field="factor_11"/>
-        <constraint desc="" exp="" field="factor_12"/>
-        <constraint desc="" exp="" field="factor_13"/>
-        <constraint desc="" exp="" field="factor_14"/>
-        <constraint desc="" exp="" field="factor_15"/>
-        <constraint desc="" exp="" field="factor_16"/>
-        <constraint desc="" exp="" field="factor_17"/>
-        <constraint desc="" exp="" field="factor_18"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="factor_1" desc=""/>
+        <constraint exp="" field="factor_2" desc=""/>
+        <constraint exp="" field="factor_3" desc=""/>
+        <constraint exp="" field="factor_4" desc=""/>
+        <constraint exp="" field="factor_5" desc=""/>
+        <constraint exp="" field="factor_6" desc=""/>
+        <constraint exp="" field="factor_7" desc=""/>
+        <constraint exp="" field="factor_8" desc=""/>
+        <constraint exp="" field="factor_9" desc=""/>
+        <constraint exp="" field="factor_10" desc=""/>
+        <constraint exp="" field="factor_11" desc=""/>
+        <constraint exp="" field="factor_12" desc=""/>
+        <constraint exp="" field="factor_13" desc=""/>
+        <constraint exp="" field="factor_14" desc=""/>
+        <constraint exp="" field="factor_15" desc=""/>
+        <constraint exp="" field="factor_16" desc=""/>
+        <constraint exp="" field="factor_17" desc=""/>
+        <constraint exp="" field="factor_18" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -9592,33 +8647,27 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="factor_1" width="-1"/>
-          <column type="field" hidden="0" name="factor_2" width="-1"/>
-          <column type="field" hidden="0" name="factor_3" width="-1"/>
-          <column type="field" hidden="0" name="factor_4" width="-1"/>
-          <column type="field" hidden="0" name="factor_5" width="-1"/>
-          <column type="field" hidden="0" name="factor_6" width="-1"/>
-          <column type="field" hidden="0" name="factor_7" width="-1"/>
-          <column type="field" hidden="0" name="factor_8" width="-1"/>
-          <column type="field" hidden="0" name="factor_9" width="-1"/>
-          <column type="field" hidden="0" name="factor_10" width="-1"/>
-          <column type="field" hidden="0" name="factor_11" width="-1"/>
-          <column type="field" hidden="0" name="factor_12" width="-1"/>
-          <column type="field" hidden="0" name="factor_13" width="-1"/>
-          <column type="field" hidden="0" name="factor_14" width="-1"/>
-          <column type="field" hidden="0" name="factor_15" width="-1"/>
-          <column type="field" hidden="0" name="factor_16" width="-1"/>
-          <column type="field" hidden="0" name="factor_17" width="-1"/>
-          <column type="field" hidden="0" name="factor_18" width="-1"/>
-          <column type="field" hidden="0" name="factor_19" width="-1"/>
-          <column type="field" hidden="0" name="factor_20" width="-1"/>
-          <column type="field" hidden="0" name="factor_21" width="-1"/>
-          <column type="field" hidden="0" name="factor_22" width="-1"/>
-          <column type="field" hidden="0" name="factor_23" width="-1"/>
-          <column type="field" hidden="0" name="factor_24" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="factor_1"/>
+          <column type="field" width="-1" hidden="0" name="factor_2"/>
+          <column type="field" width="-1" hidden="0" name="factor_3"/>
+          <column type="field" width="-1" hidden="0" name="factor_4"/>
+          <column type="field" width="-1" hidden="0" name="factor_5"/>
+          <column type="field" width="-1" hidden="0" name="factor_6"/>
+          <column type="field" width="-1" hidden="0" name="factor_7"/>
+          <column type="field" width="-1" hidden="0" name="factor_8"/>
+          <column type="field" width="-1" hidden="0" name="factor_9"/>
+          <column type="field" width="-1" hidden="0" name="factor_10"/>
+          <column type="field" width="-1" hidden="0" name="factor_11"/>
+          <column type="field" width="-1" hidden="0" name="factor_12"/>
+          <column type="field" width="-1" hidden="0" name="factor_13"/>
+          <column type="field" width="-1" hidden="0" name="factor_14"/>
+          <column type="field" width="-1" hidden="0" name="factor_15"/>
+          <column type="field" width="-1" hidden="0" name="factor_16"/>
+          <column type="field" width="-1" hidden="0" name="factor_17"/>
+          <column type="field" width="-1" hidden="0" name="factor_18"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9671,12 +8720,33 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
         <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="factor_1"/>
+        <field labelOnTop="0" name="factor_10"/>
+        <field labelOnTop="0" name="factor_11"/>
+        <field labelOnTop="0" name="factor_12"/>
+        <field labelOnTop="0" name="factor_13"/>
+        <field labelOnTop="0" name="factor_14"/>
+        <field labelOnTop="0" name="factor_15"/>
+        <field labelOnTop="0" name="factor_16"/>
+        <field labelOnTop="0" name="factor_17"/>
+        <field labelOnTop="0" name="factor_18"/>
+        <field labelOnTop="0" name="factor_2"/>
+        <field labelOnTop="0" name="factor_3"/>
+        <field labelOnTop="0" name="factor_4"/>
+        <field labelOnTop="0" name="factor_5"/>
+        <field labelOnTop="0" name="factor_6"/>
+        <field labelOnTop="0" name="factor_7"/>
+        <field labelOnTop="0" name="factor_8"/>
+        <field labelOnTop="0" name="factor_9"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pump_additional20171218122636750</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pump_additional" sql=</datasource>
       <keywordList>
@@ -9703,6 +8773,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -9716,10 +8795,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -9741,7 +8828,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9750,8 +8837,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9760,8 +8847,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9770,8 +8857,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9780,21 +8867,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="curve_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="PUMP_01" name="PUMP_01"/>
-                  <Option type="QString" value="PUMP_02" name="PUMP_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9803,56 +8887,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CLOSED" name="CLOSED"/>
-                  <Option type="QString" value="OPEN" name="OPEN"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="energyparam">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="EFFIC" name="EFFIC"/>
-                  <Option type="QString" value="PATTERN" name="PATTERN"/>
-                  <Option type="QString" value="PRICE" name="PRICE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9861,76 +8927,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="order_id" field="order_id"/>
-        <alias index="3" name="power" field="power"/>
-        <alias index="4" name=" curve id" field="curve_id"/>
-        <alias index="5" name="speed" field="speed"/>
-        <alias index="6" name="pattern" field="pattern"/>
-        <alias index="7" name="status" field="status"/>
-        <alias index="8" name="energyparam" field="energyparam"/>
-        <alias index="9" name="energyvalue" field="energyvalue"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="order_id" name="order_id" index="2"/>
+        <alias field="power" name="power" index="3"/>
+        <alias field="curve_id" name=" curve id" index="4"/>
+        <alias field="speed" name="speed" index="5"/>
+        <alias field="pattern" name="pattern" index="6"/>
+        <alias field="status" name="status" index="7"/>
+        <alias field="energyparam" name="energyparam" index="8"/>
+        <alias field="energyvalue" name="energyvalue" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="order_id" applyOnUpdate="0"/>
-        <default expression="" field="power" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="speed" applyOnUpdate="0"/>
-        <default expression="" field="pattern" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="energyparam" applyOnUpdate="0"/>
-        <default expression="" field="energyvalue" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="order_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="energyparam" expression=""/>
+        <default applyOnUpdate="0" field="energyvalue" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="order_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="power"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="speed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="energyparam"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="energyvalue"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="order_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyparam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyvalue" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="order_id"/>
-        <constraint desc="" exp="" field="power"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="speed"/>
-        <constraint desc="" exp="" field="pattern"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="energyparam"/>
-        <constraint desc="" exp="" field="energyvalue"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="order_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="energyparam" desc=""/>
+        <constraint exp="" field="energyvalue" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="order_id" width="-1"/>
-          <column type="field" hidden="0" name="power" width="-1"/>
-          <column type="field" hidden="0" name="curve_id" width="-1"/>
-          <column type="field" hidden="0" name="speed" width="-1"/>
-          <column type="field" hidden="0" name="pattern" width="-1"/>
-          <column type="field" hidden="0" name="status" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="order_id"/>
+          <column type="field" width="-1" hidden="0" name="power"/>
+          <column type="field" width="-1" hidden="0" name="curve_id"/>
+          <column type="field" width="-1" hidden="0" name="speed"/>
+          <column type="field" width="-1" hidden="0" name="pattern"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="energyparam"/>
+          <column type="field" width="-1" hidden="0" name="energyvalue"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9973,12 +9043,23 @@ def my_form_open(dialog, layer, feature):
         <field name="speed" editable="1"/>
         <field name="status" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="curve_id"/>
+        <field labelOnTop="0" name="energyparam"/>
+        <field labelOnTop="0" name="energyvalue"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="order_id"/>
+        <field labelOnTop="0" name="pattern"/>
+        <field labelOnTop="0" name="power"/>
+        <field labelOnTop="0" name="speed"/>
+        <field labelOnTop="0" name="status"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_quality20130813215615383</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_quality" sql=</datasource>
       <keywordList>
@@ -10018,7 +9099,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10043,7 +9124,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10059,44 +9140,44 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="initqual" field="initqual"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="initqual" name="initqual" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="initqual" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="initqual" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="initqual"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initqual" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="initqual"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="initqual" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="initqual" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="initqual"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10136,7 +9217,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_reactions_f73d50b8_9677_4153_a539_44288088218b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_reactions" sql=</datasource>
       <keywordList>
@@ -10153,7 +9234,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -10176,7 +9257,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10197,7 +9278,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -10220,22 +9301,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="descript" field="descript"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="descript" name="descript" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -10243,9 +9324,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10269,7 +9350,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_arc20180109103020214</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_arc" sql=</datasource>
       <keywordList>
@@ -10309,7 +9390,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10330,7 +9411,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10339,8 +9420,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10349,8 +9430,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10359,7 +9440,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -10373,39 +9454,39 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="text" field="text"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="text" name="text" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10431,7 +9512,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_node20180109103020245</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_node" sql=</datasource>
       <keywordList>
@@ -10471,7 +9552,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10496,7 +9577,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10505,8 +9586,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10515,8 +9596,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10525,7 +9606,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -10539,39 +9620,39 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="text" field="text"/>
-        <alias index="3" name="active" field="active"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="text" name="text" index="2"/>
+        <alias field="active" name="active" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="active"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="140"/>
-          <column type="field" hidden="0" name="text" width="257"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="140" hidden="0" name="node_id"/>
+          <column type="field" width="257" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10613,7 +9694,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="-4.65661e-10" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="-4.65661e-10" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_source20130813215615594</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_source" sql=</datasource>
       <keywordList>
@@ -10640,6 +9721,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10653,10 +9743,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -10674,10 +9772,11 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="variableNames" value="_fields_"/>
-        <property key="variableValues" value=""/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10686,22 +9785,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sourc_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="CONCEN" name="CONCEN"/>
-                  <Option type="QString" value="FLOWPACED" name="FLOWPACED"/>
-                  <Option type="QString" value="MASS" name="MASS"/>
-                  <Option type="QString" value="SETPOINT" name="SETPOINT"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10710,77 +9805,65 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="sourc_type" field="sourc_type"/>
-        <alias index="2" name="quality" field="quality"/>
-        <alias index="3" name="pattern_id" field="pattern_id"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="sourc_type" name="sourc_type" index="1"/>
+        <alias field="quality" name="quality" index="2"/>
+        <alias field="pattern_id" name="pattern_id" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="sourc_type" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="sourc_type" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sourc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sourc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="sourc_type"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="sourc_type" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5bf224c0-cbdb-424f-bf89-7261c1778097}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{e54b4ee0-6770-4558-9c37-87e9e290f252}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="sourc_type" width="-1"/>
-          <column type="field" hidden="0" name="quality" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="sourc_type"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10817,12 +9900,17 @@ def my_form_open(dialog, layer, feature):
         <field name="quality" editable="1"/>
         <field name="sourc_type" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+        <field labelOnTop="0" name="quality"/>
+        <field labelOnTop="0" name="sourc_type"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>macroexploitation20171207121804523</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macroexpl_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."macroexploitation" sql=</datasource>
       <keywordList>
@@ -10849,6 +9937,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10862,10 +9959,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -10882,23 +9987,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macroexpl_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10906,45 +10021,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macroexpl_id" field="macroexpl_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="undelete" field="undelete"/>
+        <alias field="macroexpl_id" name="macroexpl_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="undelete" name="undelete" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -10952,11 +10070,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10968,7 +10086,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -10977,12 +10111,17 @@ def my_form_open(dialog, layer, feature):
         <field name="name" editable="1"/>
         <field name="undelete" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="macroexpl_id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="undelete"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("macroexp_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_arc_x_pavement20160710012151609</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."plan_arc_x_pavement" sql=</datasource>
       <shortname>plan_arc_x_pavement</shortname>
@@ -11010,6 +10149,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -11023,10 +10171,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -11043,8 +10199,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11053,8 +10213,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11063,21 +10223,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pavcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="Asphalt" name="Asphalt"/>
-                  <Option type="QString" value="pavement1" name="pavement1"/>
-                  <Option type="QString" value="pavement2" name="pavement2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11086,38 +10243,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="pavcat_id" field="pavcat_id"/>
-        <alias index="3" name="percent" field="percent"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="pavcat_id" name="pavcat_id" index="2"/>
+        <alias field="percent" name="percent" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="pavcat_id" applyOnUpdate="0"/>
-        <default expression="" field="percent" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="pavcat_id" expression=""/>
+        <default applyOnUpdate="0" field="percent" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pavcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="percent"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pavcat_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="percent" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="pavcat_id"/>
-        <constraint desc="" exp="" field="percent"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="pavcat_id" desc=""/>
+        <constraint exp="" field="percent" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -11125,11 +10282,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="pavcat_id" width="-1"/>
-          <column type="field" hidden="0" name="percent" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="pavcat_id"/>
+          <column type="field" width="-1" hidden="0" name="percent"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11141,7 +10298,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -11150,12 +10323,17 @@ def my_form_open(dialog, layer, feature):
         <field name="pavcat_id" editable="1"/>
         <field name="percent" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="arc_id"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pavcat_id"/>
+        <field labelOnTop="0" name="percent"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price_compost" sql=</datasource>
       <keywordList>
@@ -11172,7 +10350,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -11195,7 +10373,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -11218,7 +10396,7 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -11255,30 +10433,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="compost_id"/>
-        <alias index="2" name="" field="simple_id"/>
-        <alias index="3" name="" field="value"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="compost_id" name="" index="1"/>
+        <alias field="simple_id" name="" index="2"/>
+        <alias field="value" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="compost_id" applyOnUpdate="0"/>
-        <default expression="" field="simple_id" applyOnUpdate="0"/>
-        <default expression="" field="value" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="compost_id" expression=""/>
+        <default applyOnUpdate="0" field="simple_id" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="compost_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="simple_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="value"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="compost_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="simple_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="compost_id"/>
-        <constraint desc="" exp="" field="simple_id"/>
-        <constraint desc="" exp="" field="value"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="compost_id" desc=""/>
+        <constraint exp="" field="simple_id" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -11286,11 +10464,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="compost_id" width="-1"/>
-          <column type="field" hidden="0" name="simple_id" width="-1"/>
-          <column type="field" hidden="0" name="value" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="compost_id"/>
+          <column type="field" width="-1" hidden="0" name="simple_id"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11311,7 +10489,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price" sql=</datasource>
       <keywordList>
@@ -11328,7 +10506,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -11351,7 +10529,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -11374,7 +10552,7 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property key="dualview/previewExpressions" value="&quot;descript&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -11425,38 +10603,38 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="unit"/>
-        <alias index="2" name="" field="descript"/>
-        <alias index="3" name="" field="text"/>
-        <alias index="4" name="" field="price"/>
-        <alias index="5" name="" field="pricecat_id"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="unit" name="" index="1"/>
+        <alias field="descript" name="" index="2"/>
+        <alias field="text" name="" index="3"/>
+        <alias field="price" name="" index="4"/>
+        <alias field="pricecat_id" name="" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="unit" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="price" applyOnUpdate="0"/>
-        <default expression="" field="pricecat_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="unit" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="price" expression=""/>
+        <default applyOnUpdate="0" field="pricecat_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="price"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pricecat_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="unit" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="price" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pricecat_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="unit"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="price"/>
-        <constraint desc="" exp="" field="pricecat_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="unit" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="price" desc=""/>
+        <constraint exp="" field="pricecat_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -11464,13 +10642,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="unit" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="field" hidden="0" name="price" width="-1"/>
-          <column type="field" hidden="0" name="pricecat_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="unit"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="price"/>
+          <column type="field" width="-1" hidden="0" name="pricecat_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11491,7 +10669,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"descript"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11550,7 +10728,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -11574,118 +10752,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" symbol="0" label="Obsolete" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0"/>
-          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" symbol="1" label="On service" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1"/>
-          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" symbol="2" label="Planified" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2"/>
-          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" symbol="3" label="Varc" filter=" &quot;sys_type&quot; = 'VARC' "/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11694,79 +10872,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="arccat_id" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="LineGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="0" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -11779,22 +10957,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12368,338 +11546,338 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="node_1"/>
-        <alias index="3" name="" field="node_2"/>
-        <alias index="4" name="" field="elevation1"/>
-        <alias index="5" name="" field="depth1"/>
-        <alias index="6" name="" field="elevation2"/>
-        <alias index="7" name="" field="depth2"/>
-        <alias index="8" name="" field="arccat_id"/>
-        <alias index="9" name="" field="arc_type"/>
-        <alias index="10" name="" field="sys_type"/>
-        <alias index="11" name="" field="cat_matcat_id"/>
-        <alias index="12" name="" field="cat_pnom"/>
-        <alias index="13" name="" field="cat_dnom"/>
-        <alias index="14" name="" field="epa_type"/>
-        <alias index="15" name="" field="expl_id"/>
-        <alias index="16" name="" field="macroexpl_id"/>
-        <alias index="17" name="" field="sector_id"/>
-        <alias index="18" name="" field="sector_name"/>
-        <alias index="19" name="" field="macrosector_id"/>
-        <alias index="20" name="" field="state"/>
-        <alias index="21" name="" field="state_type"/>
-        <alias index="22" name="" field="annotation"/>
-        <alias index="23" name="" field="observ"/>
-        <alias index="24" name="" field="comment"/>
-        <alias index="25" name="" field="gis_length"/>
-        <alias index="26" name="" field="custom_length"/>
-        <alias index="27" name="" field="minsector_id"/>
-        <alias index="28" name="" field="dma_id"/>
-        <alias index="29" name="" field="dma_name"/>
-        <alias index="30" name="" field="macrodma_id"/>
-        <alias index="31" name="" field="presszone_id"/>
-        <alias index="32" name="" field="presszone_name"/>
-        <alias index="33" name="" field="dqa_id"/>
-        <alias index="34" name="" field="dqa_name"/>
-        <alias index="35" name="" field="macrodqa_id"/>
-        <alias index="36" name="" field="soilcat_id"/>
-        <alias index="37" name="" field="function_type"/>
-        <alias index="38" name="" field="category_type"/>
-        <alias index="39" name="" field="fluid_type"/>
-        <alias index="40" name="" field="location_type"/>
-        <alias index="41" name="" field="workcat_id"/>
-        <alias index="42" name="" field="workcat_id_end"/>
-        <alias index="43" name="" field="buildercat_id"/>
-        <alias index="44" name="" field="builtdate"/>
-        <alias index="45" name="" field="enddate"/>
-        <alias index="46" name="" field="ownercat_id"/>
-        <alias index="47" name="" field="muni_id"/>
-        <alias index="48" name="" field="postcode"/>
-        <alias index="49" name="" field="district_id"/>
-        <alias index="50" name="" field="streetname"/>
-        <alias index="51" name="" field="postnumber"/>
-        <alias index="52" name="" field="postcomplement"/>
-        <alias index="53" name="" field="streetname2"/>
-        <alias index="54" name="" field="postnumber2"/>
-        <alias index="55" name="" field="postcomplement2"/>
-        <alias index="56" name="" field="descript"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="cat_arctype_id"/>
-        <alias index="68" name="" field="nodetype_1"/>
-        <alias index="69" name="" field="staticpress1"/>
-        <alias index="70" name="" field="nodetype_2"/>
-        <alias index="71" name="" field="staticpress2"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="depth"/>
-        <alias index="77" name="" field="adate"/>
-        <alias index="78" name="" field="adescript"/>
-        <alias index="79" name="" field="dma_style"/>
-        <alias index="80" name="" field="presszone_style"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="node_1" name="" index="2"/>
+        <alias field="node_2" name="" index="3"/>
+        <alias field="elevation1" name="" index="4"/>
+        <alias field="depth1" name="" index="5"/>
+        <alias field="elevation2" name="" index="6"/>
+        <alias field="depth2" name="" index="7"/>
+        <alias field="arccat_id" name="" index="8"/>
+        <alias field="arc_type" name="" index="9"/>
+        <alias field="sys_type" name="" index="10"/>
+        <alias field="cat_matcat_id" name="" index="11"/>
+        <alias field="cat_pnom" name="" index="12"/>
+        <alias field="cat_dnom" name="" index="13"/>
+        <alias field="epa_type" name="" index="14"/>
+        <alias field="expl_id" name="" index="15"/>
+        <alias field="macroexpl_id" name="" index="16"/>
+        <alias field="sector_id" name="" index="17"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="elevation1" applyOnUpdate="0"/>
-        <default expression="" field="depth1" applyOnUpdate="0"/>
-        <default expression="" field="elevation2" applyOnUpdate="0"/>
-        <default expression="" field="depth2" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="gis_length" applyOnUpdate="0"/>
-        <default expression="" field="custom_length" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="cat_arctype_id" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_1" applyOnUpdate="0"/>
-        <default expression="" field="staticpress1" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_2" applyOnUpdate="0"/>
-        <default expression="" field="staticpress2" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gis_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_arctype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="elevation1"/>
-        <constraint desc="" exp="" field="depth1"/>
-        <constraint desc="" exp="" field="elevation2"/>
-        <constraint desc="" exp="" field="depth2"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="gis_length"/>
-        <constraint desc="" exp="" field="custom_length"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="cat_arctype_id"/>
-        <constraint desc="" exp="" field="nodetype_1"/>
-        <constraint desc="" exp="" field="staticpress1"/>
-        <constraint desc="" exp="" field="nodetype_2"/>
-        <constraint desc="" exp="" field="staticpress2"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -12707,79 +11885,79 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="node_1" width="-1"/>
-          <column type="field" hidden="0" name="node_2" width="-1"/>
-          <column type="field" hidden="0" name="elevation1" width="-1"/>
-          <column type="field" hidden="0" name="depth1" width="-1"/>
-          <column type="field" hidden="0" name="elevation2" width="-1"/>
-          <column type="field" hidden="0" name="depth2" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="gis_length" width="-1"/>
-          <column type="field" hidden="0" name="custom_length" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="cat_arctype_id" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_1" width="-1"/>
-          <column type="field" hidden="0" name="staticpress1" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_2" width="-1"/>
-          <column type="field" hidden="0" name="staticpress2" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12964,7 +12142,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxcircle20180403155702431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxcircle" (geom_polygon) sql=</datasource>
       <keywordList>
@@ -13004,7 +12182,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -13024,26 +12202,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="115,189,167,0"/>
-              <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="227,26,28,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="115,189,167,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="227,26,28,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13060,22 +12238,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13084,33 +12262,33 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
+        <alias field="id" name="id" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13149,7 +12327,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxpoint20180403155702690</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxpoint" (geom_point) sql=</datasource>
       <keywordList>
@@ -13189,7 +12367,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -13209,33 +12387,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13252,22 +12430,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13276,33 +12454,33 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
+        <alias field="id" name="id" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13341,7 +12519,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13400,7 +12578,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13424,179 +12602,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" symbol="0" label="Greentap" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500"/>
-          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" symbol="1" label="Wjoin" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500"/>
-          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" symbol="2" label="Tap" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500"/>
-          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" symbol="3" label="Fountain" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13611,22 +12789,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14186,330 +13364,330 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="connec_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="connecat_id"/>
-        <alias index="7" name="" field="expl_id"/>
-        <alias index="8" name="" field="macroexpl_id"/>
-        <alias index="9" name="" field="sector_id"/>
-        <alias index="10" name="" field="sector_name"/>
-        <alias index="11" name="" field="macrosector_id"/>
-        <alias index="12" name="" field="customer_code"/>
-        <alias index="13" name="" field="cat_matcat_id"/>
-        <alias index="14" name="" field="cat_pnom"/>
-        <alias index="15" name="" field="cat_dnom"/>
-        <alias index="16" name="" field="connec_length"/>
-        <alias index="17" name="" field="state"/>
-        <alias index="18" name="" field="state_type"/>
-        <alias index="19" name="" field="n_hydrometer"/>
-        <alias index="20" name="" field="arc_id"/>
-        <alias index="21" name="" field="annotation"/>
-        <alias index="22" name="" field="observ"/>
-        <alias index="23" name="" field="comment"/>
-        <alias index="24" name="" field="minsector_id"/>
-        <alias index="25" name="" field="dma_id"/>
-        <alias index="26" name="" field="dma_name"/>
-        <alias index="27" name="" field="macrodma_id"/>
-        <alias index="28" name="" field="presszone_id"/>
-        <alias index="29" name="" field="presszone_name"/>
-        <alias index="30" name="" field="staticpressure"/>
-        <alias index="31" name="" field="dqa_id"/>
-        <alias index="32" name="" field="dqa_name"/>
-        <alias index="33" name="" field="macrodqa_id"/>
-        <alias index="34" name="" field="soilcat_id"/>
-        <alias index="35" name="" field="function_type"/>
-        <alias index="36" name="" field="category_type"/>
-        <alias index="37" name="" field="fluid_type"/>
-        <alias index="38" name="" field="location_type"/>
-        <alias index="39" name="" field="workcat_id"/>
-        <alias index="40" name="" field="workcat_id_end"/>
-        <alias index="41" name="" field="buildercat_id"/>
-        <alias index="42" name="" field="builtdate"/>
-        <alias index="43" name="" field="enddate"/>
-        <alias index="44" name="" field="ownercat_id"/>
-        <alias index="45" name="" field="muni_id"/>
-        <alias index="46" name="" field="postcode"/>
-        <alias index="47" name="" field="district_id"/>
-        <alias index="48" name="" field="streetname"/>
-        <alias index="49" name="" field="postnumber"/>
-        <alias index="50" name="" field="postcomplement"/>
-        <alias index="51" name="" field="streetname2"/>
-        <alias index="52" name="" field="postnumber2"/>
-        <alias index="53" name="" field="postcomplement2"/>
-        <alias index="54" name="" field="descript"/>
-        <alias index="55" name="" field="svg"/>
-        <alias index="56" name="" field="rotation"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="connectype_id"/>
-        <alias index="68" name="" field="feature_id"/>
-        <alias index="69" name="" field="featurecat_id"/>
-        <alias index="70" name="" field="pjoint_id"/>
-        <alias index="71" name="" field="pjoint_type"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="adate"/>
-        <alias index="77" name="" field="adescript"/>
-        <alias index="78" name="" field="accessibility"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="connec_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="connecat_id" name="" index="6"/>
+        <alias field="expl_id" name="" index="7"/>
+        <alias field="macroexpl_id" name="" index="8"/>
+        <alias field="sector_id" name="" index="9"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connec_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="connec_length" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="n_hydrometer" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="n_hydrometer"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connec_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="connec_length"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="n_hydrometer"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -14517,79 +13695,79 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="connec_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="connecat_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="connec_length" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="n_hydrometer" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_type" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14772,7 +13950,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -14821,11 +13999,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -14849,586 +14027,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" symbol="0" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600"/>
-          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" symbol="1" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600"/>
-          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" symbol="2" scalemindenom="600" scalemaxdenom="1600"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@1">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@2">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="angle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="&quot;arrow&quot;" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@3">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@2">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="angle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="&quot;arrow&quot;" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@3">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@1">
-                <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@2">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="angle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="&quot;arrow&quot; +180" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@3">
-                <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@4">
-                <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -15438,611 +14616,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{750be282-d4cc-4137-9551-e68430260327}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="LabelRotation">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="x_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="y_label" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" placementFlags="1" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="LabelRotation">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="360 - (&quot;rotation_label&quot;)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="x_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="y_label" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot;  - 2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '()'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="MapUnit" fontUnderline="0" fontSize="2.3" blendMode="0" namedStyle="Light">
-                <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;x_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="&amp;" multilineAlign="1" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;x_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="&quot;y_symbol&quot; -2.5" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -16197,28 +15375,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16227,8 +15405,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16237,8 +15415,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16247,8 +15425,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16257,16 +15435,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -16274,8 +15455,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16284,8 +15465,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16294,23 +15475,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -16318,8 +15505,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16328,34 +15515,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16364,93 +15545,96 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="distance" field="distance"/>
-        <alias index="2" name="depth" field="depth"/>
-        <alias index="3" name="x_label" field="x_label"/>
-        <alias index="4" name="y_label" field="y_label"/>
-        <alias index="5" name="rotation_label" field="rotation_label"/>
-        <alias index="6" name="offset_label" field="offset_label"/>
-        <alias index="7" name="direction_arrow" field="direction_arrow"/>
-        <alias index="8" name="x_symbol" field="x_symbol"/>
-        <alias index="9" name="y_symbol" field="y_symbol"/>
-        <alias index="10" name="feature_id" field="feature_id"/>
-        <alias index="11" name="feature_type" field="feature_type"/>
-        <alias index="12" name="state" field="state"/>
-        <alias index="13" name="expl_id" field="expl_id"/>
-        <alias index="14" name="observ" field="observ"/>
-        <alias index="15" name="comment" field="comment"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="distance" name="distance" index="1"/>
+        <alias field="depth" name="depth" index="2"/>
+        <alias field="x_label" name="x_label" index="3"/>
+        <alias field="y_label" name="y_label" index="4"/>
+        <alias field="rotation_label" name="rotation_label" index="5"/>
+        <alias field="offset_label" name="offset_label" index="6"/>
+        <alias field="direction_arrow" name="direction_arrow" index="7"/>
+        <alias field="x_symbol" name="x_symbol" index="8"/>
+        <alias field="y_symbol" name="y_symbol" index="9"/>
+        <alias field="feature_id" name="feature_id" index="10"/>
+        <alias field="feature_type" name="feature_type" index="11"/>
+        <alias field="state" name="state" index="12"/>
+        <alias field="expl_id" name="expl_id" index="13"/>
+        <alias field="observ" name="observ" index="14"/>
+        <alias field="comment" name="comment" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="x_label" applyOnUpdate="0"/>
-        <default expression="" field="y_label" applyOnUpdate="0"/>
-        <default expression="" field="rotation_label" applyOnUpdate="0"/>
-        <default expression="" field="offset_label" applyOnUpdate="0"/>
-        <default expression="" field="direction_arrow" applyOnUpdate="0"/>
-        <default expression="" field="x_symbol" applyOnUpdate="0"/>
-        <default expression="" field="y_symbol" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_type" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="x_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="offset_label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="direction_arrow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="x_symbol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_symbol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="x_label"/>
-        <constraint desc="" exp="" field="y_label"/>
-        <constraint desc="" exp="" field="rotation_label"/>
-        <constraint desc="" exp="" field="offset_label"/>
-        <constraint desc="" exp="" field="direction_arrow"/>
-        <constraint desc="" exp="" field="x_symbol"/>
-        <constraint desc="" exp="" field="y_symbol"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="feature_type"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -16458,22 +15642,23 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="distance" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="x_label" width="-1"/>
-          <column type="field" hidden="0" name="y_label" width="-1"/>
-          <column type="field" hidden="0" name="rotation_label" width="-1"/>
-          <column type="field" hidden="0" name="offset_label" width="-1"/>
-          <column type="field" hidden="0" name="direction_arrow" width="-1"/>
-          <column type="field" hidden="0" name="x_symbol" width="-1"/>
-          <column type="field" hidden="0" name="y_symbol" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_type" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16523,6 +15708,7 @@ def my_form_open(dialog, layer, feature):
         <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -16543,7 +15729,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -16598,11 +15784,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -16626,145 +15812,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="name" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category symbol="0" label="dma1-1d" value="dma1-1d" render="true"/>
-          <category symbol="1" label="dma1-2d" value="dma1-2d" render="true"/>
-          <category symbol="2" label="dma2-1d" value="dma2-1d" render="true"/>
-          <category symbol="3" label="source-1" value="source-1" render="true"/>
-          <category symbol="4" label="source-2" value="source-2" render="true"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16781,28 +15967,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="dma_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16811,8 +15997,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16821,8 +16007,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16831,8 +16017,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16841,8 +16027,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16851,8 +16037,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16861,8 +16047,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16871,8 +16057,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16881,8 +16067,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16891,8 +16077,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16901,8 +16087,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16911,8 +16097,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16921,8 +16107,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -16936,91 +16122,91 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="dma_id" field="dma_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="macrodma_id" field="macrodma_id"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="undelete" field="undelete"/>
-        <alias index="5" name="expl_id" field="expl_id"/>
-        <alias index="6" name="pattern_id" field="pattern_id"/>
-        <alias index="7" name="link" field="link"/>
-        <alias index="8" name="minc" field="minc"/>
-        <alias index="9" name="maxc" field="maxc"/>
-        <alias index="10" name="effc" field="effc"/>
-        <alias index="11" name="grafconfig" field="grafconfig"/>
-        <alias index="12" name="" field="stylesheet"/>
+        <alias field="dma_id" name="dma_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="macrodma_id" name="macrodma_id" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
+        <alias field="expl_id" name="expl_id" index="5"/>
+        <alias field="pattern_id" name="pattern_id" index="6"/>
+        <alias field="link" name="link" index="7"/>
+        <alias field="minc" name="minc" index="8"/>
+        <alias field="maxc" name="maxc" index="9"/>
+        <alias field="effc" name="effc" index="10"/>
+        <alias field="grafconfig" name="grafconfig" index="11"/>
+        <alias field="stylesheet" name="" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="minc" applyOnUpdate="0"/>
-        <default expression="" field="maxc" applyOnUpdate="0"/>
-        <default expression="" field="effc" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="maxc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="effc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="minc"/>
-        <constraint desc="" exp="" field="maxc"/>
-        <constraint desc="" exp="" field="effc"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{be5d940b-02fd-451d-a305-acaddf30c925}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="176"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="minc" width="-1"/>
-          <column type="field" hidden="0" name="maxc" width="-1"/>
-          <column type="field" hidden="0" name="effc" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17083,7 +16269,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="0" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -17142,7 +16328,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -17166,122 +16352,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="name" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category symbol="0" label="dqa1-1d" value="dqa1-1d" render="true"/>
-          <category symbol="1" label="dqa1-1s" value="dqa1-1s" render="true"/>
-          <category symbol="2" label="dqa2-1d" value="dqa2-1d" render="true"/>
-          <category symbol="3" label="dqa2-1s" value="dqa2-1s" render="true"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17303,22 +16489,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17327,8 +16513,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17337,8 +16523,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17347,8 +16533,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17357,8 +16543,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17367,8 +16553,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17377,8 +16563,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17387,8 +16573,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17397,8 +16583,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17407,8 +16593,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17417,8 +16603,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17432,58 +16618,58 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="dqa_id" field="dqa_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="expl_id" field="expl_id"/>
-        <alias index="3" name="macrodqa_id" field="macrodqa_id"/>
-        <alias index="4" name="descript" field="descript"/>
-        <alias index="5" name="undelete" field="undelete"/>
-        <alias index="6" name="pattern_id" field="pattern_id"/>
-        <alias index="7" name="dqa_type" field="dqa_type"/>
-        <alias index="8" name="link" field="link"/>
-        <alias index="9" name="grafconfig" field="grafconfig"/>
-        <alias index="10" name="" field="stylesheet"/>
+        <alias field="dqa_id" name="dqa_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="expl_id" name="expl_id" index="2"/>
+        <alias field="macrodqa_id" name="macrodqa_id" index="3"/>
+        <alias field="descript" name="descript" index="4"/>
+        <alias field="undelete" name="undelete" index="5"/>
+        <alias field="pattern_id" name="pattern_id" index="6"/>
+        <alias field="dqa_type" name="dqa_type" index="7"/>
+        <alias field="link" name="link" index="8"/>
+        <alias field="grafconfig" name="grafconfig" index="9"/>
+        <alias field="stylesheet" name="" index="10"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_type" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="dqa_type"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -17491,17 +16677,17 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_type" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17562,13 +16748,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="1" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -17617,11 +16797,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -17645,33 +16825,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17688,22 +16868,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17711,21 +16891,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -17733,8 +16922,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17743,41 +16932,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="95" name="CANCELED FICTICIOUS"/>
-                  <Option type="QString" value="96" name="CANCELED PLANIFIED"/>
-                  <Option type="QString" value="97" name="DONE FICTICIOUS"/>
-                  <Option type="QString" value="98" name="DONE PLANIFIED"/>
-                  <Option type="QString" value="99" name="FICTICIUS"/>
-                  <Option type="QString" value="1" name="OBSOLETE"/>
-                  <Option type="QString" value="2" name="ON_SERVICE"/>
-                  <Option type="QString" value="3" name="PLANIFIED"/>
-                  <Option type="QString" value="5" name="PROVISIONAL"/>
-                  <Option type="QString" value="4" name="RECONSTRUCT"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17786,8 +16962,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17796,8 +16972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17806,8 +16982,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17815,42 +16991,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="Standard Category" name="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="Standard Location" name="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="Standard Fluid" name="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17858,27 +17031,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="builder1" name="builder1"/>
-                  <Option type="QString" value="builder2" name="builder2"/>
-                  <Option type="QString" value="builder3" name="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17887,8 +17062,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17897,22 +17072,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="owner1" name="owner1"/>
-                  <Option type="QString" value="owner2" name="owner2"/>
-                  <Option type="QString" value="owner3" name="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17921,8 +17092,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17931,21 +17102,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="TO REVIEW" name="TO REVIEW"/>
-                  <Option type="QString" value="VERIFIED" name="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17954,8 +17122,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17964,8 +17132,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17974,8 +17142,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17984,16 +17152,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -18001,155 +17172,166 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="Element id" field="element_id"/>
-        <alias index="1" name="Code" field="code"/>
-        <alias index="2" name="Catalog" field="elementcat_id"/>
-        <alias index="3" name="elementtype_id" field="elementtype_id"/>
-        <alias index="4" name="serial_number" field="serial_number"/>
-        <alias index="5" name="State" field="state"/>
-        <alias index="6" name="State type" field="state_type"/>
-        <alias index="7" name="num_elements" field="num_elements"/>
-        <alias index="8" name="observ" field="observ"/>
-        <alias index="9" name="comment" field="comment"/>
-        <alias index="10" name="Function type" field="function_type"/>
-        <alias index="11" name="Category type" field="category_type"/>
-        <alias index="12" name="Location type" field="location_type"/>
-        <alias index="13" name="Fluid type" field="fluid_type"/>
-        <alias index="14" name="Workcat" field="workcat_id"/>
-        <alias index="15" name="Workcat end" field="workcat_id_end"/>
-        <alias index="16" name="Builder" field="buildercat_id"/>
-        <alias index="17" name="builtdate" field="builtdate"/>
-        <alias index="18" name="enddate" field="enddate"/>
-        <alias index="19" name="Owner" field="ownercat_id"/>
-        <alias index="20" name="rotation" field="rotation"/>
-        <alias index="21" name="link" field="link"/>
-        <alias index="22" name="Verified" field="verified"/>
-        <alias index="23" name="label_x" field="label_x"/>
-        <alias index="24" name="label_y" field="label_y"/>
-        <alias index="25" name="label_rotation" field="label_rotation"/>
-        <alias index="26" name="publish" field="publish"/>
-        <alias index="27" name="inventory" field="inventory"/>
-        <alias index="28" name="undelete" field="undelete"/>
-        <alias index="29" name="Exploitation" field="expl_id"/>
+        <alias field="element_id" name="Element id" index="0"/>
+        <alias field="code" name="Code" index="1"/>
+        <alias field="elementcat_id" name="Catalog" index="2"/>
+        <alias field="elementtype_id" name="elementtype_id" index="3"/>
+        <alias field="serial_number" name="serial_number" index="4"/>
+        <alias field="state" name="State" index="5"/>
+        <alias field="state_type" name="State type" index="6"/>
+        <alias field="num_elements" name="num_elements" index="7"/>
+        <alias field="observ" name="observ" index="8"/>
+        <alias field="comment" name="comment" index="9"/>
+        <alias field="function_type" name="Function type" index="10"/>
+        <alias field="category_type" name="Category type" index="11"/>
+        <alias field="location_type" name="Location type" index="12"/>
+        <alias field="fluid_type" name="Fluid type" index="13"/>
+        <alias field="workcat_id" name="Workcat" index="14"/>
+        <alias field="workcat_id_end" name="Workcat end" index="15"/>
+        <alias field="buildercat_id" name="Builder" index="16"/>
+        <alias field="builtdate" name="builtdate" index="17"/>
+        <alias field="enddate" name="enddate" index="18"/>
+        <alias field="ownercat_id" name="Owner" index="19"/>
+        <alias field="rotation" name="rotation" index="20"/>
+        <alias field="link" name="link" index="21"/>
+        <alias field="verified" name="Verified" index="22"/>
+        <alias field="label_x" name="label_x" index="23"/>
+        <alias field="label_y" name="label_y" index="24"/>
+        <alias field="label_rotation" name="label_rotation" index="25"/>
+        <alias field="publish" name="publish" index="26"/>
+        <alias field="inventory" name="inventory" index="27"/>
+        <alias field="undelete" name="undelete" index="28"/>
+        <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="element_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elementcat_id" applyOnUpdate="0"/>
-        <default expression="" field="elementtype_id" applyOnUpdate="0"/>
-        <default expression="" field="serial_number" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="num_elements" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="element_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elementcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elementtype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="serial_number"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_elements"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="element_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elementcat_id"/>
-        <constraint desc="" exp="" field="elementtype_id"/>
-        <constraint desc="" exp="" field="serial_number"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="num_elements"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -18157,37 +17339,38 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="element_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elementcat_id" width="-1"/>
-          <column type="field" hidden="0" name="serial_number" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="num_elements" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="elementtype_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18240,6 +17423,7 @@ def my_form_open(dialog, layer, feature):
         <field name="num_elements" editable="1"/>
         <field name="observ" editable="1"/>
         <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
         <field name="publish" editable="1"/>
         <field name="rotation" editable="1"/>
         <field name="serial_number" editable="1"/>
@@ -18272,6 +17456,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -18293,7 +17478,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18352,7 +17537,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -18376,26 +17561,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18412,38 +17597,44 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="expl_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18452,20 +17643,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Macroexploitation-1"/>
-                  <Option type="QString" value="0" name="Undefined"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18474,60 +17663,69 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="expl_id" field="expl_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="macroexpl_id" field="macroexpl_id"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="undelete" field="undelete"/>
-        <alias index="5" name="tstamp" field="tstamp"/>
+        <alias field="expl_id" name="expl_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="macroexpl_id" name="macroexpl_id" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
+        <alias field="tstamp" name="tstamp" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="1" constraints="1" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="tstamp"/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -18535,13 +17733,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="168"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18592,7 +17790,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18658,33 +17856,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="164,113,88,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18697,7 +17895,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -18811,74 +18009,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="connecat_id"/>
-        <alias index="4" name="" field="arc_id"/>
-        <alias index="5" name="" field="sector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="pjoint_type"/>
-        <alias index="12" name="" field="pjoint_id"/>
-        <alias index="13" name="" field="demand"/>
-        <alias index="14" name="" field="pattern_id"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="connecat_id" name="" index="3"/>
+        <alias field="arc_id" name="" index="4"/>
+        <alias field="sector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="pjoint_type" name="" index="11"/>
+        <alias field="pjoint_id" name="" index="12"/>
+        <alias field="demand" name="" index="13"/>
+        <alias field="pattern_id" name="" index="14"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -18905,7 +18103,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_edit_inp_demand20180212154336936</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_demand" sql=</datasource>
       <keywordList>
@@ -18932,6 +18130,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -18945,10 +18152,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -18970,7 +18185,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18979,18 +18194,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="node_id">
+        <field name="feature_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18999,92 +18214,90 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                  <Option type="QString" value="dma02_period05" name="dma02_period05"/>
-                  <Option type="QString" value="dma02_period06" name="dma02_period06"/>
-                  <Option type="QString" value="dma02_period07" name="dma02_period07"/>
-                  <Option type="QString" value="dma02_unitary" name="dma02_unitary"/>
-                  <Option type="QString" value="dma03_period05" name="dma03_period05"/>
-                  <Option type="QString" value="dma03_period06" name="dma03_period06"/>
-                  <Option type="QString" value="dma03_period07" name="dma03_period07"/>
-                  <Option type="QString" value="dma03_unitary" name="dma03_unitary"/>
-                  <Option type="QString" value="pattern_01" name="pattern_01"/>
-                  <Option type="QString" value="pattern_02" name="pattern_02"/>
-                  <Option type="QString" value="pattern_03" name="pattern_03"/>
-                  <Option type="QString" value="pattern_hydrant" name="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="deman_type">
-          <editWidget type="ValueMap">
+        <field name="demand_type">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="2" name="CRM PERIOD"/>
-                  <Option type="QString" value="1" name="ESTIMATED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dscenario_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Hydrants_50%"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="feature_type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="demand" field="demand"/>
-        <alias index="3" name="pattern_id" field="pattern_id"/>
-        <alias index="4" name="deman_type" field="deman_type"/>
-        <alias index="5" name="dscenario_id" field="dscenario_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="feature_id" name="" index="1"/>
+        <alias field="demand" name="demand" index="2"/>
+        <alias field="pattern_id" name="pattern_id" index="3"/>
+        <alias field="demand_type" name="" index="4"/>
+        <alias field="dscenario_id" name="dscenario_id" index="5"/>
+        <alias field="feature_type" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
-        <default expression="" field="deman_type" applyOnUpdate="0"/>
-        <default expression="" field="dscenario_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="demand_type" expression=""/>
+        <default applyOnUpdate="0" field="dscenario_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="deman_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dscenario_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dscenario_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="pattern_id"/>
-        <constraint desc="" exp="" field="deman_type"/>
-        <constraint desc="" exp="" field="dscenario_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="demand_type" desc=""/>
+        <constraint exp="" field="dscenario_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -19092,13 +18305,14 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="demand" width="-1"/>
-          <column type="field" hidden="0" name="pattern_id" width="-1"/>
-          <column type="field" hidden="0" name="deman_type" width="-1"/>
-          <column type="field" hidden="0" name="dscenario_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dscenario_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="demand_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19132,17 +18346,28 @@ def my_form_open(dialog, layer, feature):
       <editable>
         <field name="deman_type" editable="1"/>
         <field name="demand" editable="1"/>
+        <field name="demand_type" editable="1"/>
         <field name="dscenario_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
         <field name="id" editable="1"/>
         <field name="node_id" editable="1"/>
         <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="demand"/>
+        <field labelOnTop="0" name="demand_type"/>
+        <field labelOnTop="0" name="dscenario_id"/>
+        <field labelOnTop="0" name="feature_id"/>
+        <field labelOnTop="0" name="feature_type"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19208,33 +18433,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="135,221,121,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="135,221,121,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19247,7 +18472,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19382,86 +18607,86 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="initlevel"/>
-        <alias index="12" name="" field="minlevel"/>
-        <alias index="13" name="" field="maxlevel"/>
-        <alias index="14" name="" field="diameter"/>
-        <alias index="15" name="" field="minvol"/>
-        <alias index="16" name="" field="curve_id"/>
-        <alias index="17" name="" field="pattern_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="initlevel" name="" index="11"/>
+        <alias field="minlevel" name="" index="12"/>
+        <alias field="maxlevel" name="" index="13"/>
+        <alias field="diameter" name="" index="14"/>
+        <alias field="minvol" name="" index="15"/>
+        <alias field="curve_id" name="" index="16"/>
+        <alias field="pattern_id" name="" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="initlevel" applyOnUpdate="0"/>
-        <default expression="" field="minlevel" applyOnUpdate="0"/>
-        <default expression="" field="maxlevel" applyOnUpdate="0"/>
-        <default expression="" field="diameter" applyOnUpdate="0"/>
-        <default expression="" field="minvol" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="initlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="maxlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="diameter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minvol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="initlevel"/>
-        <constraint desc="" exp="" field="minlevel"/>
-        <constraint desc="" exp="" field="maxlevel"/>
-        <constraint desc="" exp="" field="diameter"/>
-        <constraint desc="" exp="" field="minvol"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -19488,7 +18713,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19554,33 +18779,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19593,7 +18818,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19686,62 +18911,62 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="demand"/>
-        <alias index="11" name="" field="pattern_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="demand" name="" index="10"/>
+        <alias field="pattern_id" name="" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -19768,7 +18993,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19834,37 +19059,37 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="30,128,239,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="30,128,239,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineWidth">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19877,7 +19102,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -19998,78 +19223,78 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="node_1"/>
-        <alias index="2" name="" field="node_2"/>
-        <alias index="3" name="" field="arccat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="custom_length"/>
-        <alias index="12" name="" field="minorloss"/>
-        <alias index="13" name="" field="status"/>
-        <alias index="14" name="" field="custom_roughness"/>
-        <alias index="15" name="" field="custom_dint"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="node_1" name="" index="1"/>
+        <alias field="node_2" name="" index="2"/>
+        <alias field="arccat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="custom_length" name="" index="11"/>
+        <alias field="minorloss" name="" index="12"/>
+        <alias field="status" name="" index="13"/>
+        <alias field="custom_roughness" name="" index="14"/>
+        <alias field="custom_dint" name="" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="custom_length" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="custom_roughness" applyOnUpdate="0"/>
-        <default expression="" field="custom_dint" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="custom_roughness" expression=""/>
+        <default applyOnUpdate="0" field="custom_dint" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_roughness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_dint"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_roughness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_dint" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="custom_length"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="custom_roughness"/>
-        <constraint desc="" exp="" field="custom_dint"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="custom_roughness" desc=""/>
+        <constraint exp="" field="custom_dint" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20096,7 +19321,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20162,33 +19387,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="92,146,179,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="92,146,179,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20201,7 +19426,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -20336,86 +19561,86 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="state"/>
-        <alias index="7" name="" field="state_type"/>
-        <alias index="8" name="" field="annotation"/>
-        <alias index="9" name="" field="expl_id"/>
-        <alias index="10" name="" field="dma_id"/>
-        <alias index="11" name="" field="power"/>
-        <alias index="12" name="" field="curve_id"/>
-        <alias index="13" name="" field="speed"/>
-        <alias index="14" name="" field="pattern"/>
-        <alias index="15" name="" field="to_arc"/>
-        <alias index="16" name="" field="status"/>
-        <alias index="17" name="" field="pump_type"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="state" name="" index="6"/>
+        <alias field="state_type" name="" index="7"/>
+        <alias field="annotation" name="" index="8"/>
+        <alias field="expl_id" name="" index="9"/>
+        <alias field="dma_id" name="" index="10"/>
+        <alias field="power" name="" index="11"/>
+        <alias field="curve_id" name="" index="12"/>
+        <alias field="speed" name="" index="13"/>
+        <alias field="pattern" name="" index="14"/>
+        <alias field="to_arc" name="" index="15"/>
+        <alias field="status" name="" index="16"/>
+        <alias field="pump_type" name="" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="power" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="speed" applyOnUpdate="0"/>
-        <default expression="" field="pattern" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="pump_type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="pump_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="power"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="speed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pump_type"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pump_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="power"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="speed"/>
-        <constraint desc="" exp="" field="pattern"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="pump_type"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="pump_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20442,7 +19667,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20508,33 +19733,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,203,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,203,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20547,7 +19772,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -20640,62 +19865,62 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="pattern_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="pattern_id" name="" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="pattern_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pattern_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="pattern_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -20722,7 +19947,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20788,33 +20013,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20827,7 +20052,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -20934,70 +20159,70 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="minorloss"/>
-        <alias index="12" name="" field="to_arc"/>
-        <alias index="13" name="" field="status"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="minorloss" name="" index="11"/>
+        <alias field="to_arc" name="" index="12"/>
+        <alias field="status" name="" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -21024,7 +20249,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) sql=</datasource>
       <keywordList>
@@ -21084,33 +20309,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21123,7 +20348,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -21251,82 +20476,82 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="dma_id"/>
-        <alias index="7" name="" field="state"/>
-        <alias index="8" name="" field="state_type"/>
-        <alias index="9" name="" field="annotation"/>
-        <alias index="10" name="" field="expl_id"/>
-        <alias index="11" name="" field="initlevel"/>
-        <alias index="12" name="" field="minlevel"/>
-        <alias index="13" name="" field="maxlevel"/>
-        <alias index="14" name="" field="diameter"/>
-        <alias index="15" name="" field="minvol"/>
-        <alias index="16" name="" field="curve_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="dma_id" name="" index="6"/>
+        <alias field="state" name="" index="7"/>
+        <alias field="state_type" name="" index="8"/>
+        <alias field="annotation" name="" index="9"/>
+        <alias field="expl_id" name="" index="10"/>
+        <alias field="initlevel" name="" index="11"/>
+        <alias field="minlevel" name="" index="12"/>
+        <alias field="maxlevel" name="" index="13"/>
+        <alias field="diameter" name="" index="14"/>
+        <alias field="minvol" name="" index="15"/>
+        <alias field="curve_id" name="" index="16"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="initlevel" applyOnUpdate="0"/>
-        <default expression="" field="minlevel" applyOnUpdate="0"/>
-        <default expression="" field="maxlevel" applyOnUpdate="0"/>
-        <default expression="" field="diameter" applyOnUpdate="0"/>
-        <default expression="" field="minvol" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="initlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="maxlevel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="diameter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minvol"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="initlevel"/>
-        <constraint desc="" exp="" field="minlevel"/>
-        <constraint desc="" exp="" field="maxlevel"/>
-        <constraint desc="" exp="" field="diameter"/>
-        <constraint desc="" exp="" field="minvol"/>
-        <constraint desc="" exp="" field="curve_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -21353,7 +20578,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -21419,33 +20644,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="130,85,101,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="130,85,101,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21458,7 +20683,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -21593,86 +20818,86 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="elevation"/>
-        <alias index="2" name="" field="depth"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="sector_id"/>
-        <alias index="5" name="" field="macrosector_id"/>
-        <alias index="6" name="" field="state"/>
-        <alias index="7" name="" field="state_type"/>
-        <alias index="8" name="" field="annotation"/>
-        <alias index="9" name="" field="expl_id"/>
-        <alias index="10" name="" field="valv_type"/>
-        <alias index="11" name="" field="pressure"/>
-        <alias index="12" name="" field="flow"/>
-        <alias index="13" name="" field="coef_loss"/>
-        <alias index="14" name="" field="curve_id"/>
-        <alias index="15" name="" field="minorloss"/>
-        <alias index="16" name="" field="to_arc"/>
-        <alias index="17" name="" field="status"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="elevation" name="" index="1"/>
+        <alias field="depth" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="sector_id" name="" index="4"/>
+        <alias field="macrosector_id" name="" index="5"/>
+        <alias field="state" name="" index="6"/>
+        <alias field="state_type" name="" index="7"/>
+        <alias field="annotation" name="" index="8"/>
+        <alias field="expl_id" name="" index="9"/>
+        <alias field="valv_type" name="" index="10"/>
+        <alias field="pressure" name="" index="11"/>
+        <alias field="flow" name="" index="12"/>
+        <alias field="coef_loss" name="" index="13"/>
+        <alias field="curve_id" name="" index="14"/>
+        <alias field="minorloss" name="" index="15"/>
+        <alias field="to_arc" name="" index="16"/>
+        <alias field="status" name="" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="valv_type" applyOnUpdate="0"/>
-        <default expression="" field="pressure" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="coef_loss" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="valv_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="coef_loss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="valv_type"/>
-        <constraint desc="" exp="" field="pressure"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="coef_loss"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -21699,7 +20924,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) sql=</datasource>
       <keywordList>
@@ -21759,31 +20984,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="111,182,175,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="111,182,175,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21796,7 +21021,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -21952,98 +21177,98 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="node_1"/>
-        <alias index="2" name="" field="node_2"/>
-        <alias index="3" name="" field="elevation"/>
-        <alias index="4" name="" field="depth"/>
-        <alias index="5" name="" field="arccat_id"/>
-        <alias index="6" name="" field="sector_id"/>
-        <alias index="7" name="" field="macrosector_id"/>
-        <alias index="8" name="" field="dma_id"/>
-        <alias index="9" name="" field="state"/>
-        <alias index="10" name="" field="state_type"/>
-        <alias index="11" name="" field="annotation"/>
-        <alias index="12" name="" field="expl_id"/>
-        <alias index="13" name="" field="valv_type"/>
-        <alias index="14" name="" field="pressure"/>
-        <alias index="15" name="" field="flow"/>
-        <alias index="16" name="" field="coef_loss"/>
-        <alias index="17" name="" field="curve_id"/>
-        <alias index="18" name="" field="minorloss"/>
-        <alias index="19" name="" field="to_arc"/>
-        <alias index="20" name="" field="status"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="node_1" name="" index="1"/>
+        <alias field="node_2" name="" index="2"/>
+        <alias field="elevation" name="" index="3"/>
+        <alias field="depth" name="" index="4"/>
+        <alias field="arccat_id" name="" index="5"/>
+        <alias field="sector_id" name="" index="6"/>
+        <alias field="macrosector_id" name="" index="7"/>
+        <alias field="dma_id" name="" index="8"/>
+        <alias field="state" name="" index="9"/>
+        <alias field="state_type" name="" index="10"/>
+        <alias field="annotation" name="" index="11"/>
+        <alias field="expl_id" name="" index="12"/>
+        <alias field="valv_type" name="" index="13"/>
+        <alias field="pressure" name="" index="14"/>
+        <alias field="flow" name="" index="15"/>
+        <alias field="coef_loss" name="" index="16"/>
+        <alias field="curve_id" name="" index="17"/>
+        <alias field="minorloss" name="" index="18"/>
+        <alias field="to_arc" name="" index="19"/>
+        <alias field="status" name="" index="20"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="valv_type" applyOnUpdate="0"/>
-        <default expression="" field="pressure" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="coef_loss" applyOnUpdate="0"/>
-        <default expression="" field="curve_id" applyOnUpdate="0"/>
-        <default expression="" field="minorloss" applyOnUpdate="0"/>
-        <default expression="" field="to_arc" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="valv_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="coef_loss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="curve_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minorloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="to_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="valv_type"/>
-        <constraint desc="" exp="" field="pressure"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="coef_loss"/>
-        <constraint desc="" exp="" field="curve_id"/>
-        <constraint desc="" exp="" field="minorloss"/>
-        <constraint desc="" exp="" field="to_arc"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -22070,7 +21295,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="1" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -22126,11 +21351,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -22154,69 +21379,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="GeometryGenerator" enabled="1" pass="0" locked="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@1">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -22235,28 +21460,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="1" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="link_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22265,24 +21490,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ARC" name="ARC"/>
-                  <Option type="QString" value="CONNEC" name="CONNEC"/>
-                  <Option type="QString" value="ELEMENT" name="ELEMENT"/>
-                  <Option type="QString" value="LINK" name="LINK"/>
-                  <Option type="QString" value="NODE" name="NODE"/>
-                  <Option type="QString" value="VNODE" name="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22291,24 +21510,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ARC" name="ARC"/>
-                  <Option type="QString" value="CONNEC" name="CONNEC"/>
-                  <Option type="QString" value="ELEMENT" name="ELEMENT"/>
-                  <Option type="QString" value="LINK" name="LINK"/>
-                  <Option type="QString" value="NODE" name="NODE"/>
-                  <Option type="QString" value="VNODE" name="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22317,92 +21530,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="macrosector_01"/>
-                  <Option type="QString" value="2" name="macrosector_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="dma1-1d"/>
-                  <Option type="QString" value="2" name="dma1-2d"/>
-                  <Option type="QString" value="3" name="dma2-1d"/>
-                  <Option type="QString" value="4" name="source-1"/>
-                  <Option type="QString" value="5" name="source-2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="macrodma_01"/>
-                  <Option type="QString" value="2" name="macrodma_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22411,8 +21600,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22421,8 +21610,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22430,109 +21619,121 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="link_id" field="link_id"/>
-        <alias index="1" name="feature_type" field="feature_type"/>
-        <alias index="2" name="feature_id" field="feature_id"/>
-        <alias index="3" name="exit_type" field="exit_type"/>
-        <alias index="4" name="exit_id" field="exit_id"/>
-        <alias index="5" name="sector_id" field="sector_id"/>
-        <alias index="6" name="macrosector_id" field="macrosector_id"/>
-        <alias index="7" name="dma_id" field="dma_id"/>
-        <alias index="8" name="macrodma_id" field="macrodma_id"/>
-        <alias index="9" name="expl_id" field="expl_id"/>
-        <alias index="10" name="state" field="state"/>
-        <alias index="11" name="gis_length" field="gis_length"/>
-        <alias index="12" name="userdefined_geom" field="userdefined_geom"/>
-        <alias index="13" name="ispsectorgeom" field="ispsectorgeom"/>
-        <alias index="14" name="psector_rowid" field="psector_rowid"/>
-        <alias index="15" name="" field="fluid_type"/>
-        <alias index="16" name="" field="vnode_topelev"/>
+        <alias field="link_id" name="link_id" index="0"/>
+        <alias field="feature_type" name="feature_type" index="1"/>
+        <alias field="feature_id" name="feature_id" index="2"/>
+        <alias field="exit_type" name="exit_type" index="3"/>
+        <alias field="exit_id" name="exit_id" index="4"/>
+        <alias field="sector_id" name="sector_id" index="5"/>
+        <alias field="macrosector_id" name="macrosector_id" index="6"/>
+        <alias field="dma_id" name="dma_id" index="7"/>
+        <alias field="macrodma_id" name="macrodma_id" index="8"/>
+        <alias field="expl_id" name="expl_id" index="9"/>
+        <alias field="state" name="state" index="10"/>
+        <alias field="gis_length" name="gis_length" index="11"/>
+        <alias field="userdefined_geom" name="userdefined_geom" index="12"/>
+        <alias field="ispsectorgeom" name="ispsectorgeom" index="13"/>
+        <alias field="psector_rowid" name="psector_rowid" index="14"/>
+        <alias field="fluid_type" name="" index="15"/>
+        <alias field="vnode_topelev" name="" index="16"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="link_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_type" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="gis_length" applyOnUpdate="0"/>
-        <default expression="" field="userdefined_geom" applyOnUpdate="0"/>
-        <default expression="" field="ispsectorgeom" applyOnUpdate="0"/>
-        <default expression="" field="psector_rowid" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="vnode_topelev" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="2" constraints="3" field="link_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gis_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="userdefined_geom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ispsectorgeom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="psector_rowid"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vnode_topelev"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="link_id"/>
-        <constraint desc="" exp="" field="feature_type"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="gis_length"/>
-        <constraint desc="" exp="" field="userdefined_geom"/>
-        <constraint desc="" exp="" field="ispsectorgeom"/>
-        <constraint desc="" exp="" field="psector_rowid"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="vnode_topelev"/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -22540,24 +21741,24 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="link_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_type" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="gis_length" width="-1"/>
-          <column type="field" hidden="0" name="userdefined_geom" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="ispsectorgeom" width="-1"/>
-          <column type="field" hidden="0" name="psector_rowid" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="vnode_topelev" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22630,7 +21831,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -22663,6 +21864,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22679,7 +21889,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -22696,26 +21914,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="137,1,152,0"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.86"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="137,1,152,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.86" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22732,46 +21950,55 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="macrodma_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="macrodma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macrodma_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -22779,80 +22006,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macrodma_id" field="macrodma_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="undelete" field="undelete"/>
-        <alias index="4" name="expl_id" field="expl_id"/>
+        <alias field="macrodma_id" name="macrodma_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="undelete" name="undelete" index="3"/>
+        <alias field="expl_id" name="expl_id" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macrodma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{a5136806-90c7-449b-91ff-61142b51cdbd}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be9c3210-e9e0-4e37-884f-7fcffda95a7d}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="176"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22901,7 +22128,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="0" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_macrodqa_6874a863_dc51_487b_84fc_32b5ab4352b8</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='macrodqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_macrodqa" (the_geom) sql=</datasource>
       <keywordList>
@@ -22928,6 +22155,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22944,7 +22180,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -22961,26 +22205,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.86"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.86" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22997,49 +22241,58 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macrodqa_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -23047,47 +22300,53 @@ def my_form_open(dialog, layer, feature):
         <field name="descript">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macrodqa_id" field="macrodqa_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="expl_id" field="expl_id"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="undelete" field="undelete"/>
+        <alias field="macrodqa_id" name="macrodqa_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="expl_id" name="expl_id" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macrodqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -23095,12 +22354,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23149,7 +22408,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -23182,6 +22441,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -23198,7 +22466,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -23215,26 +22491,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="0.796078" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,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="255,0,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="1"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="0.796078" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="1" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23251,37 +22527,49 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="macrosector_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -23289,45 +22577,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="macrosector_id" field="macrosector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="undelete" field="undelete"/>
+        <alias field="macrosector_id" name="macrosector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="undelete" name="undelete" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="macrosector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="undelete"/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -23335,11 +22626,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="name" width="172"/>
-          <column type="field" hidden="0" name="descript" width="184"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23386,7 +22677,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -23445,7 +22736,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -23469,989 +22760,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" symbol="0" label="Wtp" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000"/>
-          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" symbol="1" label="Waterwell" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000"/>
-          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" symbol="2" label="Source" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000"/>
-          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" symbol="3" label="Tank" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000"/>
-          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" symbol="4" label="Expantank" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500"/>
-          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" symbol="5" label="Filter" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500"/>
-          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" symbol="6" label="Flexunion" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500"/>
-          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" symbol="7" label="Hydrant" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500"/>
-          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" symbol="8" label="Meter" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500"/>
-          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" symbol="9" label="Netelement" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500"/>
-          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" symbol="10" label="Netsamplepoint" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500"/>
-          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" symbol="11" label="Pump" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500"/>
-          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" symbol="12" label="Register" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500"/>
-          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" symbol="13" label="Manhole" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500"/>
-          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" symbol="14" label="Reduction" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500"/>
-          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" symbol="15" label="Valve" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500"/>
-          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" symbol="16" label="Junction" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500"/>
-          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" symbol="17" label="Netwjoin" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="10">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="11">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="12">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="13">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="14">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="15">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="16">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="17">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="6">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="7">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="8">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="9">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24467,22 +23758,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25028,322 +24319,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -25351,75 +24642,75 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25594,7 +24885,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -25627,6 +24918,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -25640,10 +24940,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -25660,33 +24968,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="22,186,107,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="22,186,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25695,11 +25003,29 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25708,19 +25034,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="visitcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Test"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25729,8 +25054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25739,8 +25064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25749,8 +25074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25759,8 +25084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25769,67 +25094,64 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="visitcat_id" field="visitcat_id"/>
-        <alias index="2" name="ext_code" field="ext_code"/>
-        <alias index="3" name="startdate" field="startdate"/>
-        <alias index="4" name="enddate" field="enddate"/>
-        <alias index="5" name="user_name" field="user_name"/>
-        <alias index="6" name="webclient_id" field="webclient_id"/>
-        <alias index="7" name="expl_id" field="expl_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="visitcat_id" name="visitcat_id" index="1"/>
+        <alias field="ext_code" name="ext_code" index="2"/>
+        <alias field="startdate" name="startdate" index="3"/>
+        <alias field="enddate" name="enddate" index="4"/>
+        <alias field="user_name" name="user_name" index="5"/>
+        <alias field="webclient_id" name="webclient_id" index="6"/>
+        <alias field="expl_id" name="expl_id" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="visitcat_id" applyOnUpdate="0"/>
-        <default expression="" field="ext_code" applyOnUpdate="0"/>
-        <default expression="" field="startdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="user_name" applyOnUpdate="0"/>
-        <default expression="" field="webclient_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="visitcat_id" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="startdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="user_name" expression=""/>
+        <default applyOnUpdate="0" field="webclient_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="visitcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ext_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="startdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="user_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="webclient_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="visitcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="startdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="user_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="webclient_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="visitcat_id"/>
-        <constraint desc="" exp="" field="ext_code"/>
-        <constraint desc="" exp="" field="startdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="user_name"/>
-        <constraint desc="" exp="" field="webclient_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="visitcat_id" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="startdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="user_name" desc=""/>
+        <constraint exp="" field="webclient_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -25837,13 +25159,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="startdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="user_name" width="-1"/>
-          <column type="field" hidden="0" name="webclient_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="startdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="user_name"/>
+          <column type="field" width="-1" hidden="0" name="webclient_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="visitcat_id"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25855,7 +25179,23 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
@@ -25868,12 +25208,21 @@ def my_form_open(dialog, layer, feature):
         <field name="visitcat_id" editable="1"/>
         <field name="webclient_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="enddate"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="startdate"/>
+        <field labelOnTop="0" name="user_name"/>
+        <field labelOnTop="0" name="visitcat_id"/>
+        <field labelOnTop="0" name="webclient_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "user_name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="100000" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -25906,6 +25255,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -25919,10 +25277,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -25939,26 +25305,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="227,92,92,63"/>
-              <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="166,206,227,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.75"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="227,92,92,63" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="166,206,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.75" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25969,61 +25335,85 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="231,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="name" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="10" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="231,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="10" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
-                  </Option>
-                </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PolygonGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;rotation&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -26037,38 +25427,44 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="psector_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="psector_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="psector_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26077,8 +25473,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26087,36 +25483,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="priority">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="HIGH_PRIORITY" name="HIGH_PRIORITY"/>
-                  <Option type="QString" value="LOW_PRIORITY" name="LOW_PRIORITY"/>
-                  <Option type="QString" value="NORMAL_PRIORITY" name="NORMAL_PRIORITY"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="text1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -26124,8 +25523,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26134,8 +25533,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26144,24 +25543,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26170,8 +25563,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26180,16 +25573,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -26197,32 +25593,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Planified"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -26231,112 +25623,118 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ext_code">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="psector_id" field="psector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="priority" field="priority"/>
-        <alias index="4" name="text1" field="text1"/>
-        <alias index="5" name="text2" field="text2"/>
-        <alias index="6" name="observ" field="observ"/>
-        <alias index="7" name="rotation" field="rotation"/>
-        <alias index="8" name="scale" field="scale"/>
-        <alias index="9" name="sector_id" field="sector_id"/>
-        <alias index="10" name="atlas_id" field="atlas_id"/>
-        <alias index="11" name="gexpenses" field="gexpenses"/>
-        <alias index="12" name="vat" field="vat"/>
-        <alias index="13" name="other" field="other"/>
-        <alias index="14" name="expl_id" field="expl_id"/>
-        <alias index="15" name="psector_type" field="psector_type"/>
-        <alias index="16" name="active" field="active"/>
-        <alias index="17" name="ext_code" field="ext_code"/>
-        <alias index="18" name="status" field="status"/>
+        <alias field="psector_id" name="psector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="priority" name="priority" index="3"/>
+        <alias field="text1" name="text1" index="4"/>
+        <alias field="text2" name="text2" index="5"/>
+        <alias field="observ" name="observ" index="6"/>
+        <alias field="rotation" name="rotation" index="7"/>
+        <alias field="scale" name="scale" index="8"/>
+        <alias field="sector_id" name="sector_id" index="9"/>
+        <alias field="atlas_id" name="atlas_id" index="10"/>
+        <alias field="gexpenses" name="gexpenses" index="11"/>
+        <alias field="vat" name="vat" index="12"/>
+        <alias field="other" name="other" index="13"/>
+        <alias field="expl_id" name="expl_id" index="14"/>
+        <alias field="psector_type" name="psector_type" index="15"/>
+        <alias field="active" name="active" index="16"/>
+        <alias field="ext_code" name="ext_code" index="17"/>
+        <alias field="status" name="status" index="18"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="psector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="priority" applyOnUpdate="0"/>
-        <default expression="" field="text1" applyOnUpdate="0"/>
-        <default expression="" field="text2" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="scale" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="atlas_id" applyOnUpdate="0"/>
-        <default expression="" field="gexpenses" applyOnUpdate="0"/>
-        <default expression="" field="vat" applyOnUpdate="0"/>
-        <default expression="" field="other" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="psector_type" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="ext_code" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="psector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="priority" expression=""/>
+        <default applyOnUpdate="0" field="text1" expression=""/>
+        <default applyOnUpdate="0" field="text2" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="scale" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="atlas_id" expression=""/>
+        <default applyOnUpdate="0" field="gexpenses" expression=""/>
+        <default applyOnUpdate="0" field="vat" expression=""/>
+        <default applyOnUpdate="0" field="other" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="psector_type" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="psector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="priority"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="scale"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="atlas_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gexpenses"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vat"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="psector_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ext_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="psector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="priority" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="scale" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="atlas_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gexpenses" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="psector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="priority"/>
-        <constraint desc="" exp="" field="text1"/>
-        <constraint desc="" exp="" field="text2"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="scale"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="atlas_id"/>
-        <constraint desc="" exp="" field="gexpenses"/>
-        <constraint desc="" exp="" field="vat"/>
-        <constraint desc="" exp="" field="other"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="psector_type"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="ext_code"/>
-        <constraint desc="" exp="" field="status"/>
+        <constraint exp="" field="psector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="priority" desc=""/>
+        <constraint exp="" field="text1" desc=""/>
+        <constraint exp="" field="text2" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="scale" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="atlas_id" desc=""/>
+        <constraint exp="" field="gexpenses" desc=""/>
+        <constraint exp="" field="vat" desc=""/>
+        <constraint exp="" field="other" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="psector_type" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -26344,26 +25742,26 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="psector_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="206"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="priority" width="133"/>
-          <column type="field" hidden="0" name="text1" width="-1"/>
-          <column type="field" hidden="0" name="text2" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="234"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="scale" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="atlas_id" width="-1"/>
-          <column type="field" hidden="0" name="gexpenses" width="-1"/>
-          <column type="field" hidden="0" name="vat" width="-1"/>
-          <column type="field" hidden="0" name="other" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="psector_type" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="field" hidden="0" name="ext_code" width="-1"/>
-          <column type="field" hidden="0" name="status" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="psector_id"/>
+          <column type="field" width="206" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="133" hidden="0" name="priority"/>
+          <column type="field" width="-1" hidden="0" name="text1"/>
+          <column type="field" width="-1" hidden="0" name="text2"/>
+          <column type="field" width="234" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="scale"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="atlas_id"/>
+          <column type="field" width="-1" hidden="0" name="gexpenses"/>
+          <column type="field" width="-1" hidden="0" name="vat"/>
+          <column type="field" width="-1" hidden="0" name="other"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="psector_type"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26415,12 +25813,32 @@ def my_form_open(dialog, layer, feature):
         <field name="text2" editable="1"/>
         <field name="vat" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="active"/>
+        <field labelOnTop="0" name="atlas_id"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="gexpenses"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="observ"/>
+        <field labelOnTop="0" name="other"/>
+        <field labelOnTop="0" name="priority"/>
+        <field labelOnTop="0" name="psector_id"/>
+        <field labelOnTop="0" name="psector_type"/>
+        <field labelOnTop="0" name="rotation"/>
+        <field labelOnTop="0" name="scale"/>
+        <field labelOnTop="0" name="sector_id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="text1"/>
+        <field labelOnTop="0" name="text2"/>
+        <field labelOnTop="0" name="vat"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -26479,7 +25897,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -26503,168 +25921,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="name" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category symbol="0" label="pzone1-1d" value="pzone1-1d" render="true"/>
-          <category symbol="1" label="pzone1-1s" value="pzone1-1s" render="true"/>
-          <category symbol="2" label="pzone1-2d" value="pzone1-2d" render="true"/>
-          <category symbol="3" label="pzone1-2s" value="pzone1-2s" render="true"/>
-          <category symbol="4" label="pzone2-1s" value="pzone2-1s" render="true"/>
-          <category symbol="5" label="pzone2-2d" value="pzone2-2d" render="true"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="4">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="5">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.4" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26681,28 +26099,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -26751,38 +26169,38 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="presszone_id"/>
-        <alias index="1" name="" field="name"/>
-        <alias index="2" name="" field="expl_id"/>
-        <alias index="3" name="" field="grafconfig"/>
-        <alias index="4" name="" field="head"/>
-        <alias index="5" name="" field="stylesheet"/>
+        <alias field="presszone_id" name="" index="0"/>
+        <alias field="name" name="" index="1"/>
+        <alias field="expl_id" name="" index="2"/>
+        <alias field="grafconfig" name="" index="3"/>
+        <alias field="head" name="" index="4"/>
+        <alias field="stylesheet" name="" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -26790,13 +26208,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
-          <column type="field" hidden="0" name="head" width="-1"/>
-          <column type="field" hidden="0" name="stylesheet" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26847,7 +26265,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="5000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="1" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -26896,11 +26314,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -26924,59 +26342,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26993,28 +26411,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer lowerHeight="0" upperHeight="50" upperWidth="50" diagramType="Histogram" classificationAttributeExpression="" upperValue="0" attributeLegend="1" lowerValue="0" lowerWidth="0">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="sample_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27023,8 +26441,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27033,8 +26451,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27043,8 +26461,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27053,112 +26471,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="ADAPTATION" name="ADAPTATION"/>
-                  <Option type="QString" value="AIR_VALVE" name="AIR_VALVE"/>
-                  <Option type="QString" value="BYPASS_REGISTER" name="BYPASS_REGISTER"/>
-                  <Option type="QString" value="CHECK_VALVE" name="CHECK_VALVE"/>
-                  <Option type="QString" value="CLORINATHOR" name="CLORINATHOR"/>
-                  <Option type="QString" value="CONTROL_REGISTER" name="CONTROL_REGISTER"/>
-                  <Option type="QString" value="CURVE" name="CURVE"/>
-                  <Option type="QString" value="ENDLINE" name="ENDLINE"/>
-                  <Option type="QString" value="EXPANTANK" name="EXPANTANK"/>
-                  <Option type="QString" value="FILTER" name="FILTER"/>
-                  <Option type="QString" value="FLEXUNION" name="FLEXUNION"/>
-                  <Option type="QString" value="FLOWMETER" name="FLOWMETER"/>
-                  <Option type="QString" value="FL_CONTR_VALVE" name="FL_CONTR_VALVE"/>
-                  <Option type="QString" value="FOUNTAIN" name="FOUNTAIN"/>
-                  <Option type="QString" value="GEN_PURP_VALVE" name="GEN_PURP_VALVE"/>
-                  <Option type="QString" value="GREENTAP" name="GREENTAP"/>
-                  <Option type="QString" value="GREEN_VALVE" name="GREEN_VALVE"/>
-                  <Option type="QString" value="HYDRANT" name="HYDRANT"/>
-                  <Option type="QString" value="JUNCTION" name="JUNCTION"/>
-                  <Option type="QString" value="MANHOLE" name="MANHOLE"/>
-                  <Option type="QString" value="NETELEMENT" name="NETELEMENT"/>
-                  <Option type="QString" value="NETSAMPLEPOINT" name="NETSAMPLEPOINT"/>
-                  <Option type="QString" value="OUTFALL_VALVE" name="OUTFALL_VALVE"/>
-                  <Option type="QString" value="PIPE" name="PIPE"/>
-                  <Option type="QString" value="PRESSURE_METER" name="PRESSURE_METER"/>
-                  <Option type="QString" value="PR_BREAK_VALVE" name="PR_BREAK_VALVE"/>
-                  <Option type="QString" value="PR_REDUC_VALVE" name="PR_REDUC_VALVE"/>
-                  <Option type="QString" value="PR_SUSTA_VALVE" name="PR_SUSTA_VALVE"/>
-                  <Option type="QString" value="PUMP" name="PUMP"/>
-                  <Option type="QString" value="REDUCTION" name="REDUCTION"/>
-                  <Option type="QString" value="REGISTER" name="REGISTER"/>
-                  <Option type="QString" value="SHUTOFF_VALVE" name="SHUTOFF_VALVE"/>
-                  <Option type="QString" value="SOURCE" name="SOURCE"/>
-                  <Option type="QString" value="T" name="T"/>
-                  <Option type="QString" value="TANK" name="TANK"/>
-                  <Option type="QString" value="TAP" name="TAP"/>
-                  <Option type="QString" value="THROTTLE_VALVE" name="THROTTLE_VALVE"/>
-                  <Option type="QString" value="VALVE_REGISTER" name="VALVE_REGISTER"/>
-                  <Option type="QString" value="VARC" name="VARC"/>
-                  <Option type="QString" value="VCONNEC" name="VCONNEC"/>
-                  <Option type="QString" value="WATERWELL" name="WATERWELL"/>
-                  <Option type="QString" value="WATER_CONNECTION" name="WATER_CONNECTION"/>
-                  <Option type="QString" value="WJOIN" name="WJOIN"/>
-                  <Option type="QString" value="WTP" name="WTP"/>
-                  <Option type="QString" value="X" name="X"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="dma1-1d"/>
-                  <Option type="QString" value="2" name="dma1-2d"/>
-                  <Option type="QString" value="3" name="dma2-1d"/>
-                  <Option type="QString" value="4" name="source-1"/>
-                  <Option type="QString" value="5" name="source-2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="macrodma_01"/>
-                  <Option type="QString" value="2" name="macrodma_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="presszone_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27167,10 +26531,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="QString" value="1" name="allow_null"/>
-                <Option type="QString" value="1" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd" name="field_format"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27179,32 +26544,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="QString" value="1" name="allow_null"/>
-                <Option type="QString" value="1" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd" name="field_format"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="work1" name="work1"/>
-                  <Option type="QString" value="work2" name="work2"/>
-                  <Option type="QString" value="work3" name="work3"/>
-                  <Option type="QString" value="work4" name="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -27212,54 +26577,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27268,14 +26607,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="AllowMulti"/>
-                <Option type="QString" value="0" name="AllowNull"/>
-                <Option type="QString" value="" name="FilterExpression"/>
-                <Option type="QString" value="postnumber" name="Key"/>
-                <Option type="QString" value="ext_address20171204171433160" name="Layer"/>
-                <Option type="QString" value="0" name="OrderByValue"/>
-                <Option type="QString" value="0" name="UseCompleter"/>
-                <Option type="QString" value="postnumber" name="Value"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -27284,50 +26627,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27336,8 +26657,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27346,8 +26667,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27356,8 +26677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27366,8 +26687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27376,8 +26697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27386,170 +26707,168 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="TO REVIEW" name="TO REVIEW"/>
-                  <Option type="QString" value="VERIFIED" name="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="sample_id" field="sample_id"/>
-        <alias index="1" name="code" field="code"/>
-        <alias index="2" name="lab_code" field="lab_code"/>
-        <alias index="3" name="feature_id" field="feature_id"/>
-        <alias index="4" name="featurecat_id" field="featurecat_id"/>
-        <alias index="5" name="dma_id" field="dma_id"/>
-        <alias index="6" name="macrodma_id" field="macrodma_id"/>
-        <alias index="7" name="" field="presszone_id"/>
-        <alias index="8" name="state" field="state"/>
-        <alias index="9" name="builtdate" field="builtdate"/>
-        <alias index="10" name="enddate" field="enddate"/>
-        <alias index="11" name="workcat_id" field="workcat_id"/>
-        <alias index="12" name="workcat_id_end" field="workcat_id_end"/>
-        <alias index="13" name="rotation" field="rotation"/>
-        <alias index="14" name="muni_id" field="muni_id"/>
-        <alias index="15" name="streetaxis_id" field="streetaxis_id"/>
-        <alias index="16" name="postnumber" field="postnumber"/>
-        <alias index="17" name="postcode" field="postcode"/>
-        <alias index="18" name="" field="district_id"/>
-        <alias index="19" name="streetaxis2_id" field="streetaxis2_id"/>
-        <alias index="20" name="postnumber2" field="postnumber2"/>
-        <alias index="21" name="postcomplement" field="postcomplement"/>
-        <alias index="22" name="postcomplement2" field="postcomplement2"/>
-        <alias index="23" name="place_name" field="place_name"/>
-        <alias index="24" name="cabinet" field="cabinet"/>
-        <alias index="25" name="observations" field="observations"/>
-        <alias index="26" name="verified" field="verified"/>
-        <alias index="27" name="expl_id" field="expl_id"/>
-        <alias index="28" name="link" field="link"/>
+        <alias field="sample_id" name="sample_id" index="0"/>
+        <alias field="code" name="code" index="1"/>
+        <alias field="lab_code" name="lab_code" index="2"/>
+        <alias field="feature_id" name="feature_id" index="3"/>
+        <alias field="featurecat_id" name="featurecat_id" index="4"/>
+        <alias field="dma_id" name="dma_id" index="5"/>
+        <alias field="macrodma_id" name="macrodma_id" index="6"/>
+        <alias field="presszone_id" name="" index="7"/>
+        <alias field="state" name="state" index="8"/>
+        <alias field="builtdate" name="builtdate" index="9"/>
+        <alias field="enddate" name="enddate" index="10"/>
+        <alias field="workcat_id" name="workcat_id" index="11"/>
+        <alias field="workcat_id_end" name="workcat_id_end" index="12"/>
+        <alias field="rotation" name="rotation" index="13"/>
+        <alias field="muni_id" name="muni_id" index="14"/>
+        <alias field="streetaxis_id" name="streetaxis_id" index="15"/>
+        <alias field="postnumber" name="postnumber" index="16"/>
+        <alias field="postcode" name="postcode" index="17"/>
+        <alias field="district_id" name="" index="18"/>
+        <alias field="streetaxis2_id" name="streetaxis2_id" index="19"/>
+        <alias field="postnumber2" name="postnumber2" index="20"/>
+        <alias field="postcomplement" name="postcomplement" index="21"/>
+        <alias field="postcomplement2" name="postcomplement2" index="22"/>
+        <alias field="place_name" name="place_name" index="23"/>
+        <alias field="cabinet" name="cabinet" index="24"/>
+        <alias field="observations" name="observations" index="25"/>
+        <alias field="verified" name="verified" index="26"/>
+        <alias field="expl_id" name="expl_id" index="27"/>
+        <alias field="link" name="link" index="28"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="sample_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="lab_code" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis2_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="place_name" applyOnUpdate="0"/>
-        <default expression="" field="cabinet" applyOnUpdate="0"/>
-        <default expression="" field="observations" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="sample_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lab_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis2_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="place_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cabinet"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observations"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="sample_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="lab_code"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetaxis2_id"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="place_name"/>
-        <constraint desc="" exp="" field="cabinet"/>
-        <constraint desc="" exp="" field="observations"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="link"/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -27557,34 +26876,36 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="sample_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="lab_code" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis2_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="place_name" width="-1"/>
-          <column type="field" hidden="0" name="cabinet" width="-1"/>
-          <column type="field" hidden="0" name="observations" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27619,6 +26940,7 @@ def my_form_open(dialog, layer, feature):
         <field name="builtdate" editable="1"/>
         <field name="cabinet" editable="1"/>
         <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
         <field name="dma_id" editable="1"/>
         <field name="enddate" editable="1"/>
         <field name="expl_id" editable="1"/>
@@ -27635,6 +26957,7 @@ def my_form_open(dialog, layer, feature):
         <field name="postcomplement2" editable="1"/>
         <field name="postnumber" editable="1"/>
         <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
         <field name="presszonecat_id" editable="1"/>
         <field name="rotation" editable="1"/>
         <field name="sample_id" editable="1"/>
@@ -27649,12 +26972,14 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -27664,6 +26989,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -27678,7 +27004,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -27733,11 +27059,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -27761,144 +27087,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="sector_id" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category symbol="0" label="0" value="0" render="true"/>
-          <category symbol="1" label="1" value="1" render="true"/>
-          <category symbol="2" label="2" value="2" render="true"/>
-          <category symbol="3" label="3" value="3" render="true"/>
-          <category symbol="4" label="4" value="4" render="true"/>
-          <category symbol="5" label="5" value="5" render="true"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="1">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="2">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="3">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="4">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="fill" clip_to_extent="1" alpha="0.5" force_rhr="0" name="5">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27916,22 +27242,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27940,8 +27266,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27950,8 +27276,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27960,8 +27286,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27970,8 +27296,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27980,8 +27306,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -27990,8 +27316,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28005,42 +27331,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="sector_id" field="sector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="descript" field="descript"/>
-        <alias index="3" name="macrosector_id" field="macrosector_id"/>
-        <alias index="4" name="undelete" field="undelete"/>
-        <alias index="5" name="grafconfig" field="grafconfig"/>
-        <alias index="6" name="" field="stylesheet"/>
+        <alias field="sector_id" name="sector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="descript" name="descript" index="2"/>
+        <alias field="macrosector_id" name="macrosector_id" index="3"/>
+        <alias field="undelete" name="undelete" index="4"/>
+        <alias field="grafconfig" name="grafconfig" index="5"/>
+        <alias field="stylesheet" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="grafconfig" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="grafconfig"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="grafconfig"/>
-        <constraint desc="" exp="" field="stylesheet"/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -28048,13 +27374,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="172"/>
-          <column type="field" hidden="0" name="descript" width="184"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="grafconfig" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28105,7 +27431,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -28160,11 +27486,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -28188,33 +27514,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28225,79 +27551,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="postnumber" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="PointGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -28310,22 +27636,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -28334,19 +27660,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28355,43 +27680,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28400,8 +27700,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28410,21 +27710,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28432,52 +27729,55 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="muni_id" field="muni_id"/>
-        <alias index="2" name="postcode" field="postcode"/>
-        <alias index="3" name="streetaxis_id" field="streetaxis_id"/>
-        <alias index="4" name="postnumber" field="postnumber"/>
-        <alias index="5" name="plot_id" field="plot_id"/>
-        <alias index="6" name="expl_id" field="expl_id"/>
-        <alias index="7" name="" field="name"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="muni_id" name="muni_id" index="1"/>
+        <alias field="postcode" name="postcode" index="2"/>
+        <alias field="streetaxis_id" name="streetaxis_id" index="3"/>
+        <alias field="postnumber" name="postnumber" index="4"/>
+        <alias field="plot_id" name="plot_id" index="5"/>
+        <alias field="expl_id" name="expl_id" index="6"/>
+        <alias field="name" name="" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="plot_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="plot_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="plot_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -28485,15 +27785,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="plot_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28548,7 +27848,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -28603,11 +27903,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -28631,26 +27931,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28667,34 +27967,34 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -28703,8 +28003,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28713,19 +28013,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28734,43 +28033,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1-10450C" name="Avenida Can Carreras"/>
-                  <Option type="QString" value="1-9100C" name="Avenida de Aragó"/>
-                  <Option type="QString" value="1-9150C" name="Avenida de la Torre de la Vila"/>
-                  <Option type="QString" value="1-11000C" name="Avenida del General Prim"/>
-                  <Option type="QString" value="1-10400C" name="Calle Benviure"/>
-                  <Option type="QString" value="1-10100C" name="Calle Legalitat"/>
-                  <Option type="QString" value="1-10330C" name="Calle Victoria"/>
-                  <Option type="QString" value="1-10350C" name="Calle d'Antoni Gaudí"/>
-                  <Option type="QString" value="1-10410C" name="Calle d'Antoni Rubió i LLuch"/>
-                  <Option type="QString" value="1-10310C" name="Calle d'Eusebi Güell"/>
-                  <Option type="QString" value="1-10110C" name="Calle de Federico Garcia Lorca"/>
-                  <Option type="QString" value="1-10230C" name="Calle de Francesc Layret"/>
-                  <Option type="QString" value="1-10120C" name="Calle de Galicia"/>
-                  <Option type="QString" value="1-10320C" name="Calle de Johan Pfaff"/>
-                  <Option type="QString" value="1-10300C" name="Calle de Jordi Rubió i Balaguer"/>
-                  <Option type="QString" value="1-9110C" name="Calle de Josep Trueta"/>
-                  <Option type="QString" value="1-10480C" name="Calle de Lepant"/>
-                  <Option type="QString" value="1-10222C" name="Calle de Menorca"/>
-                  <Option type="QString" value="1-9120C" name="Calle de Narcis Monturiol"/>
-                  <Option type="QString" value="1-10360C" name="Calle de Roselló"/>
-                  <Option type="QString" value="1-10220C" name="Calle de Salvador Espriu"/>
-                  <Option type="QString" value="1-11011C" name="Calle de Salvador Seguí"/>
-                  <Option type="QString" value="1-10240C" name="Calle de la Mare de Deu de Montserrat"/>
-                  <Option type="QString" value="1-10420C" name="Passaje Santa Teresa"/>
-                  <Option type="QString" value="1-10000C" name="Ronda de Sant Ramon"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28779,8 +28053,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28789,8 +28063,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28799,8 +28073,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28809,8 +28083,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28819,8 +28093,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -28829,83 +28103,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="plot_code" field="plot_code"/>
-        <alias index="2" name="muni_id" field="muni_id"/>
-        <alias index="3" name="postcode" field="postcode"/>
-        <alias index="4" name="streetaxis_id" field="streetaxis_id"/>
-        <alias index="5" name="postnumber" field="postnumber"/>
-        <alias index="6" name="complement" field="complement"/>
-        <alias index="7" name="placement" field="placement"/>
-        <alias index="8" name="square" field="square"/>
-        <alias index="9" name="observ" field="observ"/>
-        <alias index="10" name="text" field="text"/>
-        <alias index="11" name="expl_id" field="expl_id"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="plot_code" name="plot_code" index="1"/>
+        <alias field="muni_id" name="muni_id" index="2"/>
+        <alias field="postcode" name="postcode" index="3"/>
+        <alias field="streetaxis_id" name="streetaxis_id" index="4"/>
+        <alias field="postnumber" name="postnumber" index="5"/>
+        <alias field="complement" name="complement" index="6"/>
+        <alias field="placement" name="placement" index="7"/>
+        <alias field="square" name="square" index="8"/>
+        <alias field="observ" name="observ" index="9"/>
+        <alias field="text" name="text" index="10"/>
+        <alias field="expl_id" name="expl_id" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="plot_code" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="complement" applyOnUpdate="0"/>
-        <default expression="" field="placement" applyOnUpdate="0"/>
-        <default expression="" field="square" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="plot_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="complement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="placement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="square"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="plot_code"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="complement"/>
-        <constraint desc="" exp="" field="placement"/>
-        <constraint desc="" exp="" field="square"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -28913,19 +28184,19 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="plot_code" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="complement" width="-1"/>
-          <column type="field" hidden="0" name="placement" width="-1"/>
-          <column type="field" hidden="0" name="square" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28988,7 +28259,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="3000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiLineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -29047,7 +28318,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -29071,31 +28342,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="1">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29106,79 +28377,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0.1875" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="name" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0.1875" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="LineGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="9" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="0.6" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -29191,22 +28462,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29215,8 +28486,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29225,19 +28496,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="" name=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29246,8 +28516,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29256,32 +28526,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="1" name="Sant Boi del Llobregat"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29290,54 +28556,54 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="code" field="code"/>
-        <alias index="2" name="type" field="type"/>
-        <alias index="3" name="name" field="name"/>
-        <alias index="4" name="text" field="text"/>
-        <alias index="5" name="expl_id" field="expl_id"/>
-        <alias index="6" name="muni_id" field="muni_id"/>
-        <alias index="7" name="descript" field="descript"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="code" name="code" index="1"/>
+        <alias field="type" name="type" index="2"/>
+        <alias field="name" name="name" index="3"/>
+        <alias field="text" name="text" index="4"/>
+        <alias field="expl_id" name="expl_id" index="5"/>
+        <alias field="muni_id" name="muni_id" index="6"/>
+        <alias field="descript" name="descript" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="text"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="descript"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -29345,15 +28611,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="type" width="-1"/>
-          <column type="field" hidden="0" name="name" width="269"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29408,7 +28674,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -29461,7 +28733,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -29485,26 +28757,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29522,22 +28794,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29546,8 +28818,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29556,8 +28828,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29566,8 +28838,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29576,8 +28848,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29586,8 +28858,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -29596,46 +28868,46 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="minsector_id" field="minsector_id"/>
-        <alias index="1" name="dma_id" field="dma_id"/>
-        <alias index="2" name="dqa_id" field="dqa_id"/>
-        <alias index="3" name="presszonecat_id" field="presszonecat_id"/>
-        <alias index="4" name="sector_id" field="sector_id"/>
-        <alias index="5" name="expl_id" field="expl_id"/>
+        <alias field="minsector_id" name="minsector_id" index="0"/>
+        <alias field="dma_id" name="dma_id" index="1"/>
+        <alias field="dqa_id" name="dqa_id" index="2"/>
+        <alias field="presszonecat_id" name="presszonecat_id" index="3"/>
+        <alias field="sector_id" name="sector_id" index="4"/>
+        <alias field="expl_id" name="expl_id" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="presszonecat_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszonecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="presszonecat_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -29643,13 +28915,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29700,7 +28972,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="0" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Line" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
       <keywordList>
@@ -29753,7 +29031,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -29777,56 +29055,56 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="76,38,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.7"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="76,38,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.7" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="255,206,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="255,206,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29843,22 +29121,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29893,30 +29171,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="arc_id"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="arc_id" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="arc_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -29924,11 +29202,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29975,7 +29253,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
       <keywordList>
@@ -30028,7 +29312,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30052,33 +29336,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="45,84,255,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="0,24,124,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.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="45,84,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,24,124,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30095,22 +29379,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30362,154 +29646,154 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="work_order"/>
-        <alias index="2" name="" field="state"/>
-        <alias index="3" name="" field="class"/>
-        <alias index="4" name="" field="mincut_type"/>
-        <alias index="5" name="" field="received_date"/>
-        <alias index="6" name="" field="expl_id"/>
-        <alias index="7" name="" field="expl_name"/>
-        <alias index="8" name="" field="macroexpl_name"/>
-        <alias index="9" name="" field="macroexpl_id"/>
-        <alias index="10" name="" field="muni_id"/>
-        <alias index="11" name="" field="muni_name"/>
-        <alias index="12" name="" field="postcode"/>
-        <alias index="13" name="" field="streetaxis_id"/>
-        <alias index="14" name="" field="street_name"/>
-        <alias index="15" name="" field="postnumber"/>
-        <alias index="16" name="" field="anl_cause"/>
-        <alias index="17" name="" field="anl_tstamp"/>
-        <alias index="18" name="" field="anl_user"/>
-        <alias index="19" name="" field="anl_descript"/>
-        <alias index="20" name="" field="anl_feature_id"/>
-        <alias index="21" name="" field="anl_feature_type"/>
-        <alias index="22" name="" field="forecast_start"/>
-        <alias index="23" name="" field="forecast_end"/>
-        <alias index="24" name="" field="assigned_to"/>
-        <alias index="25" name="" field="exec_start"/>
-        <alias index="26" name="" field="exec_end"/>
-        <alias index="27" name="" field="exec_user"/>
-        <alias index="28" name="" field="exec_descript"/>
-        <alias index="29" name="" field="exec_the_geom"/>
-        <alias index="30" name="" field="exec_from_plot"/>
-        <alias index="31" name="" field="exec_depth"/>
-        <alias index="32" name="" field="exec_appropiate"/>
-        <alias index="33" name="" field="notified"/>
-        <alias index="34" name="" field="output"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="work_order" name="" index="1"/>
+        <alias field="state" name="" index="2"/>
+        <alias field="class" name="" index="3"/>
+        <alias field="mincut_type" name="" index="4"/>
+        <alias field="received_date" name="" index="5"/>
+        <alias field="expl_id" name="" index="6"/>
+        <alias field="expl_name" name="" index="7"/>
+        <alias field="macroexpl_name" name="" index="8"/>
+        <alias field="macroexpl_id" name="" index="9"/>
+        <alias field="muni_id" name="" index="10"/>
+        <alias field="muni_name" name="" index="11"/>
+        <alias field="postcode" name="" index="12"/>
+        <alias field="streetaxis_id" name="" index="13"/>
+        <alias field="street_name" name="" index="14"/>
+        <alias field="postnumber" name="" index="15"/>
+        <alias field="anl_cause" name="" index="16"/>
+        <alias field="anl_tstamp" name="" index="17"/>
+        <alias field="anl_user" name="" index="18"/>
+        <alias field="anl_descript" name="" index="19"/>
+        <alias field="anl_feature_id" name="" index="20"/>
+        <alias field="anl_feature_type" name="" index="21"/>
+        <alias field="forecast_start" name="" index="22"/>
+        <alias field="forecast_end" name="" index="23"/>
+        <alias field="assigned_to" name="" index="24"/>
+        <alias field="exec_start" name="" index="25"/>
+        <alias field="exec_end" name="" index="26"/>
+        <alias field="exec_user" name="" index="27"/>
+        <alias field="exec_descript" name="" index="28"/>
+        <alias field="exec_the_geom" name="" index="29"/>
+        <alias field="exec_from_plot" name="" index="30"/>
+        <alias field="exec_depth" name="" index="31"/>
+        <alias field="exec_appropiate" name="" index="32"/>
+        <alias field="notified" name="" index="33"/>
+        <alias field="output" name="" index="34"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="class" applyOnUpdate="0"/>
-        <default expression="" field="mincut_type" applyOnUpdate="0"/>
-        <default expression="" field="received_date" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_name" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_name" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_name" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="streetaxis_id" applyOnUpdate="0"/>
-        <default expression="" field="street_name" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="anl_cause" applyOnUpdate="0"/>
-        <default expression="" field="anl_tstamp" applyOnUpdate="0"/>
-        <default expression="" field="anl_user" applyOnUpdate="0"/>
-        <default expression="" field="anl_descript" applyOnUpdate="0"/>
-        <default expression="" field="anl_feature_id" applyOnUpdate="0"/>
-        <default expression="" field="anl_feature_type" applyOnUpdate="0"/>
-        <default expression="" field="forecast_start" applyOnUpdate="0"/>
-        <default expression="" field="forecast_end" applyOnUpdate="0"/>
-        <default expression="" field="assigned_to" applyOnUpdate="0"/>
-        <default expression="" field="exec_start" applyOnUpdate="0"/>
-        <default expression="" field="exec_end" applyOnUpdate="0"/>
-        <default expression="" field="exec_user" applyOnUpdate="0"/>
-        <default expression="" field="exec_descript" applyOnUpdate="0"/>
-        <default expression="" field="exec_the_geom" applyOnUpdate="0"/>
-        <default expression="" field="exec_from_plot" applyOnUpdate="0"/>
-        <default expression="" field="exec_depth" applyOnUpdate="0"/>
-        <default expression="" field="exec_appropiate" applyOnUpdate="0"/>
-        <default expression="" field="notified" applyOnUpdate="0"/>
-        <default expression="" field="output" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="mincut_type" expression=""/>
+        <default applyOnUpdate="0" field="received_date" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_name" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="street_name" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="anl_cause" expression=""/>
+        <default applyOnUpdate="0" field="anl_tstamp" expression=""/>
+        <default applyOnUpdate="0" field="anl_user" expression=""/>
+        <default applyOnUpdate="0" field="anl_descript" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_id" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_type" expression=""/>
+        <default applyOnUpdate="0" field="forecast_start" expression=""/>
+        <default applyOnUpdate="0" field="forecast_end" expression=""/>
+        <default applyOnUpdate="0" field="assigned_to" expression=""/>
+        <default applyOnUpdate="0" field="exec_start" expression=""/>
+        <default applyOnUpdate="0" field="exec_end" expression=""/>
+        <default applyOnUpdate="0" field="exec_user" expression=""/>
+        <default applyOnUpdate="0" field="exec_descript" expression=""/>
+        <default applyOnUpdate="0" field="exec_the_geom" expression=""/>
+        <default applyOnUpdate="0" field="exec_from_plot" expression=""/>
+        <default applyOnUpdate="0" field="exec_depth" expression=""/>
+        <default applyOnUpdate="0" field="exec_appropiate" expression=""/>
+        <default applyOnUpdate="0" field="notified" expression=""/>
+        <default applyOnUpdate="0" field="output" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="class"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="mincut_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="received_date"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetaxis_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="street_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_cause"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="anl_feature_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="forecast_start"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="forecast_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="assigned_to"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_start"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_the_geom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_from_plot"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exec_appropiate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="notified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="output"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mincut_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="received_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="street_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_cause" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="assigned_to" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_the_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_from_plot" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_appropiate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="notified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="output" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="class"/>
-        <constraint desc="" exp="" field="mincut_type"/>
-        <constraint desc="" exp="" field="received_date"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="expl_name"/>
-        <constraint desc="" exp="" field="macroexpl_name"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="muni_name"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="streetaxis_id"/>
-        <constraint desc="" exp="" field="street_name"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="anl_cause"/>
-        <constraint desc="" exp="" field="anl_tstamp"/>
-        <constraint desc="" exp="" field="anl_user"/>
-        <constraint desc="" exp="" field="anl_descript"/>
-        <constraint desc="" exp="" field="anl_feature_id"/>
-        <constraint desc="" exp="" field="anl_feature_type"/>
-        <constraint desc="" exp="" field="forecast_start"/>
-        <constraint desc="" exp="" field="forecast_end"/>
-        <constraint desc="" exp="" field="assigned_to"/>
-        <constraint desc="" exp="" field="exec_start"/>
-        <constraint desc="" exp="" field="exec_end"/>
-        <constraint desc="" exp="" field="exec_user"/>
-        <constraint desc="" exp="" field="exec_descript"/>
-        <constraint desc="" exp="" field="exec_the_geom"/>
-        <constraint desc="" exp="" field="exec_from_plot"/>
-        <constraint desc="" exp="" field="exec_depth"/>
-        <constraint desc="" exp="" field="exec_appropiate"/>
-        <constraint desc="" exp="" field="notified"/>
-        <constraint desc="" exp="" field="output"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="mincut_type" desc=""/>
+        <constraint exp="" field="received_date" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="expl_name" desc=""/>
+        <constraint exp="" field="macroexpl_name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="muni_name" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="street_name" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="anl_cause" desc=""/>
+        <constraint exp="" field="anl_tstamp" desc=""/>
+        <constraint exp="" field="anl_user" desc=""/>
+        <constraint exp="" field="anl_descript" desc=""/>
+        <constraint exp="" field="anl_feature_id" desc=""/>
+        <constraint exp="" field="anl_feature_type" desc=""/>
+        <constraint exp="" field="forecast_start" desc=""/>
+        <constraint exp="" field="forecast_end" desc=""/>
+        <constraint exp="" field="assigned_to" desc=""/>
+        <constraint exp="" field="exec_start" desc=""/>
+        <constraint exp="" field="exec_end" desc=""/>
+        <constraint exp="" field="exec_user" desc=""/>
+        <constraint exp="" field="exec_descript" desc=""/>
+        <constraint exp="" field="exec_the_geom" desc=""/>
+        <constraint exp="" field="exec_from_plot" desc=""/>
+        <constraint exp="" field="exec_depth" desc=""/>
+        <constraint exp="" field="exec_appropiate" desc=""/>
+        <constraint exp="" field="notified" desc=""/>
+        <constraint exp="" field="output" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -30517,42 +29801,42 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="class" width="-1"/>
-          <column type="field" hidden="0" name="mincut_type" width="-1"/>
-          <column type="field" hidden="0" name="received_date" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_name" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_name" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_name" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-          <column type="field" hidden="0" name="street_name" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="anl_cause" width="-1"/>
-          <column type="field" hidden="0" name="anl_tstamp" width="-1"/>
-          <column type="field" hidden="0" name="anl_user" width="-1"/>
-          <column type="field" hidden="0" name="anl_descript" width="-1"/>
-          <column type="field" hidden="0" name="anl_feature_id" width="-1"/>
-          <column type="field" hidden="0" name="anl_feature_type" width="-1"/>
-          <column type="field" hidden="0" name="forecast_start" width="-1"/>
-          <column type="field" hidden="0" name="forecast_end" width="-1"/>
-          <column type="field" hidden="0" name="assigned_to" width="-1"/>
-          <column type="field" hidden="0" name="exec_start" width="-1"/>
-          <column type="field" hidden="0" name="exec_end" width="-1"/>
-          <column type="field" hidden="0" name="exec_user" width="-1"/>
-          <column type="field" hidden="0" name="exec_descript" width="-1"/>
-          <column type="field" hidden="0" name="exec_the_geom" width="-1"/>
-          <column type="field" hidden="0" name="exec_from_plot" width="-1"/>
-          <column type="field" hidden="0" name="exec_depth" width="-1"/>
-          <column type="field" hidden="0" name="exec_appropiate" width="-1"/>
-          <column type="field" hidden="0" name="notified" width="-1"/>
-          <column type="field" hidden="0" name="output" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="mincut_type"/>
+          <column type="field" width="-1" hidden="0" name="received_date"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_name"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="street_name"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="anl_cause"/>
+          <column type="field" width="-1" hidden="0" name="anl_tstamp"/>
+          <column type="field" width="-1" hidden="0" name="anl_user"/>
+          <column type="field" width="-1" hidden="0" name="anl_descript"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_id"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_type"/>
+          <column type="field" width="-1" hidden="0" name="forecast_start"/>
+          <column type="field" width="-1" hidden="0" name="forecast_end"/>
+          <column type="field" width="-1" hidden="0" name="assigned_to"/>
+          <column type="field" width="-1" hidden="0" name="exec_start"/>
+          <column type="field" width="-1" hidden="0" name="exec_end"/>
+          <column type="field" width="-1" hidden="0" name="exec_user"/>
+          <column type="field" width="-1" hidden="0" name="exec_descript"/>
+          <column type="field" width="-1" hidden="0" name="exec_the_geom"/>
+          <column type="field" width="-1" hidden="0" name="exec_from_plot"/>
+          <column type="field" width="-1" hidden="0" name="exec_depth"/>
+          <column type="field" width="-1" hidden="0" name="exec_appropiate"/>
+          <column type="field" width="-1" hidden="0" name="notified"/>
+          <column type="field" width="-1" hidden="0" name="output"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30661,7 +29945,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>expl_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
       <keywordList>
@@ -30714,7 +30004,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30738,33 +30028,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="176,123,103,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="102,46,25,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="176,123,103,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="102,46,25,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30781,22 +30071,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30838,34 +30128,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="connec_id"/>
-        <alias index="4" name="" field="customer_code"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="connec_id" name="" index="3"/>
+        <alias field="customer_code" name="" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -30873,12 +30163,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30927,7 +30217,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -30980,7 +30276,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -31004,33 +30300,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="241,209,66,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="160,134,17,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="241,209,66,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="160,134,17,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31047,22 +30343,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31097,30 +30393,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="node_id"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="node_id" name="" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="node_id"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -31128,11 +30424,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31179,7 +30475,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
       <keywordList>
@@ -31232,7 +30534,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -31256,97 +30558,97 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="proposed" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="proposed" symbollevels="0">
         <categories>
-          <category symbol="0" label="Proposed to close" value="true" render="true"/>
-          <category symbol="1" label="Do not operate" value="false" render="true"/>
+          <category render="true" value="true" label="Proposed to close" symbol="0"/>
+          <category render="true" value="false" label="Do not operate" symbol="1"/>
         </categories>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,55,58,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="134,13,13,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,55,58,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="134,13,13,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="51,160,44,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="6,94,0,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="51,160,44,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="6,94,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="232,113,141,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="232,113,141,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31363,22 +30665,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31441,46 +30743,46 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="work_order"/>
-        <alias index="3" name="" field="node_id"/>
-        <alias index="4" name="" field="closed"/>
-        <alias index="5" name="" field="broken"/>
-        <alias index="6" name="" field="unaccess"/>
-        <alias index="7" name="" field="proposed"/>
+        <alias field="id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="work_order" name="" index="2"/>
+        <alias field="node_id" name="" index="3"/>
+        <alias field="closed" name="" index="4"/>
+        <alias field="broken" name="" index="5"/>
+        <alias field="unaccess" name="" index="6"/>
+        <alias field="proposed" name="" index="7"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="work_order" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="unaccess" applyOnUpdate="0"/>
-        <default expression="" field="proposed" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="unaccess" expression=""/>
+        <default applyOnUpdate="0" field="proposed" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="work_order"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="unaccess"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="proposed"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="unaccess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="proposed" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="work_order"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="unaccess"/>
-        <constraint desc="" exp="" field="proposed"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="unaccess" desc=""/>
+        <constraint exp="" field="proposed" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -31488,15 +30790,15 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="work_order" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="unaccess" width="-1"/>
-          <column type="field" hidden="0" name="proposed" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="unaccess"/>
+          <column type="field" width="-1" hidden="0" name="proposed"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31551,7 +30853,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="100000" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_current_psector" (the_geom) sql=</datasource>
       <keywordList>
@@ -31578,6 +30880,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -31594,7 +30905,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
       <vectorjoins/>
@@ -31611,26 +30930,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="227,92,92,37"/>
-              <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="197,167,227,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.75"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="227,92,92,37" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="197,167,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.75" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31641,61 +30960,85 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="231,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="name" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="10" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="231,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="10" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="133,182,111,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
-                  </Option>
-                </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="10000000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="0" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PolygonGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;rotation&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;rotation&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -31713,287 +31056,356 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="psector_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="psector_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="psector_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_type">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="descript">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="priority">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_arc">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_node">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_other">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="rotation">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="scale">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pem">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="gexpenses">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pec">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pec_vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="other">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pca">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="psector_id" field="psector_id"/>
-        <alias index="1" name="name" field="name"/>
-        <alias index="2" name="psector_type" field="psector_type"/>
-        <alias index="3" name="descript" field="descript"/>
-        <alias index="4" name="priority" field="priority"/>
-        <alias index="5" name="total_arc" field="total_arc"/>
-        <alias index="6" name="total_node" field="total_node"/>
-        <alias index="7" name="total_other" field="total_other"/>
-        <alias index="8" name="text1" field="text1"/>
-        <alias index="9" name="text2" field="text2"/>
-        <alias index="10" name="observ" field="observ"/>
-        <alias index="11" name="rotation" field="rotation"/>
-        <alias index="12" name="scale" field="scale"/>
-        <alias index="13" name="sector_id" field="sector_id"/>
-        <alias index="14" name="active" field="active"/>
-        <alias index="15" name="pem" field="pem"/>
-        <alias index="16" name="gexpenses" field="gexpenses"/>
-        <alias index="17" name="pec" field="pec"/>
-        <alias index="18" name="vat" field="vat"/>
-        <alias index="19" name="pec_vat" field="pec_vat"/>
-        <alias index="20" name="other" field="other"/>
-        <alias index="21" name="pca" field="pca"/>
+        <alias field="psector_id" name="psector_id" index="0"/>
+        <alias field="name" name="name" index="1"/>
+        <alias field="psector_type" name="psector_type" index="2"/>
+        <alias field="descript" name="descript" index="3"/>
+        <alias field="priority" name="priority" index="4"/>
+        <alias field="total_arc" name="total_arc" index="5"/>
+        <alias field="total_node" name="total_node" index="6"/>
+        <alias field="total_other" name="total_other" index="7"/>
+        <alias field="text1" name="text1" index="8"/>
+        <alias field="text2" name="text2" index="9"/>
+        <alias field="observ" name="observ" index="10"/>
+        <alias field="rotation" name="rotation" index="11"/>
+        <alias field="scale" name="scale" index="12"/>
+        <alias field="sector_id" name="sector_id" index="13"/>
+        <alias field="active" name="active" index="14"/>
+        <alias field="pem" name="pem" index="15"/>
+        <alias field="gexpenses" name="gexpenses" index="16"/>
+        <alias field="pec" name="pec" index="17"/>
+        <alias field="vat" name="vat" index="18"/>
+        <alias field="pec_vat" name="pec_vat" index="19"/>
+        <alias field="other" name="other" index="20"/>
+        <alias field="pca" name="pca" index="21"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="psector_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="psector_type" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="priority" applyOnUpdate="0"/>
-        <default expression="" field="total_arc" applyOnUpdate="0"/>
-        <default expression="" field="total_node" applyOnUpdate="0"/>
-        <default expression="" field="total_other" applyOnUpdate="0"/>
-        <default expression="" field="text1" applyOnUpdate="0"/>
-        <default expression="" field="text2" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="scale" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="active" applyOnUpdate="0"/>
-        <default expression="" field="pem" applyOnUpdate="0"/>
-        <default expression="" field="gexpenses" applyOnUpdate="0"/>
-        <default expression="" field="pec" applyOnUpdate="0"/>
-        <default expression="" field="vat" applyOnUpdate="0"/>
-        <default expression="" field="pec_vat" applyOnUpdate="0"/>
-        <default expression="" field="other" applyOnUpdate="0"/>
-        <default expression="" field="pca" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="psector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="psector_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="priority" expression=""/>
+        <default applyOnUpdate="0" field="total_arc" expression=""/>
+        <default applyOnUpdate="0" field="total_node" expression=""/>
+        <default applyOnUpdate="0" field="total_other" expression=""/>
+        <default applyOnUpdate="0" field="text1" expression=""/>
+        <default applyOnUpdate="0" field="text2" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="scale" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="pem" expression=""/>
+        <default applyOnUpdate="0" field="gexpenses" expression=""/>
+        <default applyOnUpdate="0" field="pec" expression=""/>
+        <default applyOnUpdate="0" field="vat" expression=""/>
+        <default applyOnUpdate="0" field="pec_vat" expression=""/>
+        <default applyOnUpdate="0" field="other" expression=""/>
+        <default applyOnUpdate="0" field="pca" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="psector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="psector_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="priority"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_arc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_node"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_other"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="scale"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="active"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pem"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gexpenses"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vat"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pec_vat"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pca"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="psector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="priority" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_node" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="scale" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pem" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gexpenses" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pec_vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pca" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="psector_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="psector_type"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="priority"/>
-        <constraint desc="" exp="" field="total_arc"/>
-        <constraint desc="" exp="" field="total_node"/>
-        <constraint desc="" exp="" field="total_other"/>
-        <constraint desc="" exp="" field="text1"/>
-        <constraint desc="" exp="" field="text2"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="scale"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="active"/>
-        <constraint desc="" exp="" field="pem"/>
-        <constraint desc="" exp="" field="gexpenses"/>
-        <constraint desc="" exp="" field="pec"/>
-        <constraint desc="" exp="" field="vat"/>
-        <constraint desc="" exp="" field="pec_vat"/>
-        <constraint desc="" exp="" field="other"/>
-        <constraint desc="" exp="" field="pca"/>
+        <constraint exp="" field="psector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="psector_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="priority" desc=""/>
+        <constraint exp="" field="total_arc" desc=""/>
+        <constraint exp="" field="total_node" desc=""/>
+        <constraint exp="" field="total_other" desc=""/>
+        <constraint exp="" field="text1" desc=""/>
+        <constraint exp="" field="text2" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="scale" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="pem" desc=""/>
+        <constraint exp="" field="gexpenses" desc=""/>
+        <constraint exp="" field="pec" desc=""/>
+        <constraint exp="" field="vat" desc=""/>
+        <constraint exp="" field="pec_vat" desc=""/>
+        <constraint exp="" field="other" desc=""/>
+        <constraint exp="" field="pca" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -32001,32 +31413,29 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="psector_id" width="-1"/>
-          <column type="field" hidden="0" name="name" width="206"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="priority" width="133"/>
-          <column type="field" hidden="0" name="text1" width="-1"/>
-          <column type="field" hidden="0" name="text2" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="234"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="scale" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="gexpenses" width="-1"/>
-          <column type="field" hidden="0" name="vat" width="-1"/>
-          <column type="field" hidden="0" name="other" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="psector_type" width="-1"/>
-          <column type="field" hidden="0" name="active" width="-1"/>
-          <column type="field" hidden="0" name="total_arc" width="-1"/>
-          <column type="field" hidden="0" name="total_node" width="-1"/>
-          <column type="field" hidden="0" name="total_other" width="-1"/>
-          <column type="field" hidden="0" name="pem" width="-1"/>
-          <column type="field" hidden="0" name="pec" width="-1"/>
-          <column type="field" hidden="0" name="pec_vat" width="-1"/>
-          <column type="field" hidden="0" name="pca" width="-1"/>
-          <column type="field" hidden="0" name="affec_length" width="-1"/>
-          <column type="field" hidden="0" name="plan_length" width="-1"/>
-          <column type="field" hidden="0" name="current_length" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="psector_id"/>
+          <column type="field" width="206" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="133" hidden="0" name="priority"/>
+          <column type="field" width="-1" hidden="0" name="text1"/>
+          <column type="field" width="-1" hidden="0" name="text2"/>
+          <column type="field" width="234" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="scale"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="gexpenses"/>
+          <column type="field" width="-1" hidden="0" name="vat"/>
+          <column type="field" width="-1" hidden="0" name="other"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="psector_type"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="total_arc"/>
+          <column type="field" width="-1" hidden="0" name="total_node"/>
+          <column type="field" width="-1" hidden="0" name="total_other"/>
+          <column type="field" width="-1" hidden="0" name="pem"/>
+          <column type="field" width="-1" hidden="0" name="pec"/>
+          <column type="field" width="-1" hidden="0" name="pec_vat"/>
+          <column type="field" width="-1" hidden="0" name="pca"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -32115,7 +31524,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -32170,11 +31579,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -32198,31 +31607,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="235,163,126,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="235,163,126,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32239,22 +31648,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-2.14748e+09" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -32263,8 +31672,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32273,8 +31682,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32283,8 +31692,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32293,8 +31702,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32303,8 +31712,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32313,50 +31722,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32365,8 +31762,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32375,23 +31772,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32399,23 +31802,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="z1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="z2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32423,16 +31832,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="width">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32440,8 +31852,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32450,8 +31862,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32460,8 +31872,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32470,23 +31882,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_param">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_y">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32494,8 +31912,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32504,8 +31922,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32514,8 +31932,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32524,8 +31942,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32534,8 +31952,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32544,8 +31962,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32554,8 +31972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32564,8 +31982,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32574,8 +31992,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32584,8 +32002,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32594,8 +32012,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32604,8 +32022,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32614,8 +32032,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32624,8 +32042,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32634,8 +32052,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32644,8 +32062,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32654,8 +32072,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32664,8 +32082,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32674,8 +32092,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32684,16 +32102,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="trenchl_cost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -32701,8 +32122,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32711,8 +32132,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32721,8 +32142,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32731,8 +32152,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32741,8 +32162,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32751,8 +32172,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -32761,351 +32182,387 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="other_budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtcost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtdate">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="age">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="aperiod">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="arate">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="amortized">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pending">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="arc_id" field="arc_id"/>
-        <alias index="1" name="node_1" field="node_1"/>
-        <alias index="2" name="node_2" field="node_2"/>
-        <alias index="3" name="arc_type" field="arc_type"/>
-        <alias index="4" name="arccat_id" field="arccat_id"/>
-        <alias index="5" name="epa_type" field="epa_type"/>
-        <alias index="6" name="sector_id" field="sector_id"/>
-        <alias index="7" name="expl_id" field="expl_id"/>
-        <alias index="8" name="state" field="state"/>
-        <alias index="9" name="annotation" field="annotation"/>
-        <alias index="10" name="soilcat_id" field="soilcat_id"/>
-        <alias index="11" name="y1" field="y1"/>
-        <alias index="12" name="y2" field="y2"/>
-        <alias index="13" name="mean_y" field="mean_y"/>
-        <alias index="14" name="z1" field="z1"/>
-        <alias index="15" name="z2" field="z2"/>
-        <alias index="16" name="thickness" field="thickness"/>
-        <alias index="17" name="width" field="width"/>
-        <alias index="18" name="b" field="b"/>
-        <alias index="19" name="bulk" field="bulk"/>
-        <alias index="20" name="geom1" field="geom1"/>
-        <alias index="21" name="area" field="area"/>
-        <alias index="22" name="y_param" field="y_param"/>
-        <alias index="23" name="total_y" field="total_y"/>
-        <alias index="24" name="rec_y" field="rec_y"/>
-        <alias index="25" name="geom1_ext" field="geom1_ext"/>
-        <alias index="26" name="calculed_y" field="calculed_y"/>
-        <alias index="27" name="m3mlexc" field="m3mlexc"/>
-        <alias index="28" name="m2mltrenchl" field="m2mltrenchl"/>
-        <alias index="29" name="m2mlbottom" field="m2mlbottom"/>
-        <alias index="30" name="m2mlpav" field="m2mlpav"/>
-        <alias index="31" name="m3mlprotec" field="m3mlprotec"/>
-        <alias index="32" name="m3mlfill" field="m3mlfill"/>
-        <alias index="33" name="m3mlexcess" field="m3mlexcess"/>
-        <alias index="34" name="m3exc_cost" field="m3exc_cost"/>
-        <alias index="35" name="m2trenchl_cost" field="m2trenchl_cost"/>
-        <alias index="36" name="m2bottom_cost" field="m2bottom_cost"/>
-        <alias index="37" name="m2pav_cost" field="m2pav_cost"/>
-        <alias index="38" name="m3protec_cost" field="m3protec_cost"/>
-        <alias index="39" name="m3fill_cost" field="m3fill_cost"/>
-        <alias index="40" name="m3excess_cost" field="m3excess_cost"/>
-        <alias index="41" name="cost_unit" field="cost_unit"/>
-        <alias index="42" name="pav_cost" field="pav_cost"/>
-        <alias index="43" name="exc_cost" field="exc_cost"/>
-        <alias index="44" name="trenchl_cost" field="trenchl_cost"/>
-        <alias index="45" name="base_cost" field="base_cost"/>
-        <alias index="46" name="protec_cost" field="protec_cost"/>
-        <alias index="47" name="fill_cost" field="fill_cost"/>
-        <alias index="48" name="excess_cost" field="excess_cost"/>
-        <alias index="49" name="arc_cost" field="arc_cost"/>
-        <alias index="50" name="cost" field="cost"/>
-        <alias index="51" name="length" field="length"/>
-        <alias index="52" name="budget" field="budget"/>
-        <alias index="53" name="other_budget" field="other_budget"/>
-        <alias index="54" name="total_budget" field="total_budget"/>
-        <alias index="55" name="" field="builtcost"/>
-        <alias index="56" name="" field="builtdate"/>
-        <alias index="57" name="" field="age"/>
-        <alias index="58" name="" field="acoeff"/>
-        <alias index="59" name="" field="aperiod"/>
-        <alias index="60" name="" field="arate"/>
-        <alias index="61" name="" field="amortized"/>
-        <alias index="62" name="" field="pending"/>
+        <alias field="arc_id" name="arc_id" index="0"/>
+        <alias field="node_1" name="node_1" index="1"/>
+        <alias field="node_2" name="node_2" index="2"/>
+        <alias field="arc_type" name="arc_type" index="3"/>
+        <alias field="arccat_id" name="arccat_id" index="4"/>
+        <alias field="epa_type" name="epa_type" index="5"/>
+        <alias field="sector_id" name="sector_id" index="6"/>
+        <alias field="expl_id" name="expl_id" index="7"/>
+        <alias field="state" name="state" index="8"/>
+        <alias field="annotation" name="annotation" index="9"/>
+        <alias field="soilcat_id" name="soilcat_id" index="10"/>
+        <alias field="y1" name="y1" index="11"/>
+        <alias field="y2" name="y2" index="12"/>
+        <alias field="mean_y" name="mean_y" index="13"/>
+        <alias field="z1" name="z1" index="14"/>
+        <alias field="z2" name="z2" index="15"/>
+        <alias field="thickness" name="thickness" index="16"/>
+        <alias field="width" name="width" index="17"/>
+        <alias field="b" name="b" index="18"/>
+        <alias field="bulk" name="bulk" index="19"/>
+        <alias field="geom1" name="geom1" index="20"/>
+        <alias field="area" name="area" index="21"/>
+        <alias field="y_param" name="y_param" index="22"/>
+        <alias field="total_y" name="total_y" index="23"/>
+        <alias field="rec_y" name="rec_y" index="24"/>
+        <alias field="geom1_ext" name="geom1_ext" index="25"/>
+        <alias field="calculed_y" name="calculed_y" index="26"/>
+        <alias field="m3mlexc" name="m3mlexc" index="27"/>
+        <alias field="m2mltrenchl" name="m2mltrenchl" index="28"/>
+        <alias field="m2mlbottom" name="m2mlbottom" index="29"/>
+        <alias field="m2mlpav" name="m2mlpav" index="30"/>
+        <alias field="m3mlprotec" name="m3mlprotec" index="31"/>
+        <alias field="m3mlfill" name="m3mlfill" index="32"/>
+        <alias field="m3mlexcess" name="m3mlexcess" index="33"/>
+        <alias field="m3exc_cost" name="m3exc_cost" index="34"/>
+        <alias field="m2trenchl_cost" name="m2trenchl_cost" index="35"/>
+        <alias field="m2bottom_cost" name="m2bottom_cost" index="36"/>
+        <alias field="m2pav_cost" name="m2pav_cost" index="37"/>
+        <alias field="m3protec_cost" name="m3protec_cost" index="38"/>
+        <alias field="m3fill_cost" name="m3fill_cost" index="39"/>
+        <alias field="m3excess_cost" name="m3excess_cost" index="40"/>
+        <alias field="cost_unit" name="cost_unit" index="41"/>
+        <alias field="pav_cost" name="pav_cost" index="42"/>
+        <alias field="exc_cost" name="exc_cost" index="43"/>
+        <alias field="trenchl_cost" name="trenchl_cost" index="44"/>
+        <alias field="base_cost" name="base_cost" index="45"/>
+        <alias field="protec_cost" name="protec_cost" index="46"/>
+        <alias field="fill_cost" name="fill_cost" index="47"/>
+        <alias field="excess_cost" name="excess_cost" index="48"/>
+        <alias field="arc_cost" name="arc_cost" index="49"/>
+        <alias field="cost" name="cost" index="50"/>
+        <alias field="length" name="length" index="51"/>
+        <alias field="budget" name="budget" index="52"/>
+        <alias field="other_budget" name="other_budget" index="53"/>
+        <alias field="total_budget" name="total_budget" index="54"/>
+        <alias field="builtcost" name="" index="55"/>
+        <alias field="builtdate" name="" index="56"/>
+        <alias field="age" name="" index="57"/>
+        <alias field="acoeff" name="" index="58"/>
+        <alias field="aperiod" name="" index="59"/>
+        <alias field="arate" name="" index="60"/>
+        <alias field="amortized" name="" index="61"/>
+        <alias field="pending" name="" index="62"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="y1" applyOnUpdate="0"/>
-        <default expression="" field="y2" applyOnUpdate="0"/>
-        <default expression="" field="mean_y" applyOnUpdate="0"/>
-        <default expression="" field="z1" applyOnUpdate="0"/>
-        <default expression="" field="z2" applyOnUpdate="0"/>
-        <default expression="" field="thickness" applyOnUpdate="0"/>
-        <default expression="" field="width" applyOnUpdate="0"/>
-        <default expression="" field="b" applyOnUpdate="0"/>
-        <default expression="" field="bulk" applyOnUpdate="0"/>
-        <default expression="" field="geom1" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="y_param" applyOnUpdate="0"/>
-        <default expression="" field="total_y" applyOnUpdate="0"/>
-        <default expression="" field="rec_y" applyOnUpdate="0"/>
-        <default expression="" field="geom1_ext" applyOnUpdate="0"/>
-        <default expression="" field="calculed_y" applyOnUpdate="0"/>
-        <default expression="" field="m3mlexc" applyOnUpdate="0"/>
-        <default expression="" field="m2mltrenchl" applyOnUpdate="0"/>
-        <default expression="" field="m2mlbottom" applyOnUpdate="0"/>
-        <default expression="" field="m2mlpav" applyOnUpdate="0"/>
-        <default expression="" field="m3mlprotec" applyOnUpdate="0"/>
-        <default expression="" field="m3mlfill" applyOnUpdate="0"/>
-        <default expression="" field="m3mlexcess" applyOnUpdate="0"/>
-        <default expression="" field="m3exc_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2trenchl_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2bottom_cost" applyOnUpdate="0"/>
-        <default expression="" field="m2pav_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3protec_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3fill_cost" applyOnUpdate="0"/>
-        <default expression="" field="m3excess_cost" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="pav_cost" applyOnUpdate="0"/>
-        <default expression="" field="exc_cost" applyOnUpdate="0"/>
-        <default expression="" field="trenchl_cost" applyOnUpdate="0"/>
-        <default expression="" field="base_cost" applyOnUpdate="0"/>
-        <default expression="" field="protec_cost" applyOnUpdate="0"/>
-        <default expression="" field="fill_cost" applyOnUpdate="0"/>
-        <default expression="" field="excess_cost" applyOnUpdate="0"/>
-        <default expression="" field="arc_cost" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="length" applyOnUpdate="0"/>
-        <default expression="" field="budget" applyOnUpdate="0"/>
-        <default expression="" field="other_budget" applyOnUpdate="0"/>
-        <default expression="" field="total_budget" applyOnUpdate="0"/>
-        <default expression="" field="builtcost" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="age" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
-        <default expression="" field="aperiod" applyOnUpdate="0"/>
-        <default expression="" field="arate" applyOnUpdate="0"/>
-        <default expression="" field="amortized" applyOnUpdate="0"/>
-        <default expression="" field="pending" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="y1" expression=""/>
+        <default applyOnUpdate="0" field="y2" expression=""/>
+        <default applyOnUpdate="0" field="mean_y" expression=""/>
+        <default applyOnUpdate="0" field="z1" expression=""/>
+        <default applyOnUpdate="0" field="z2" expression=""/>
+        <default applyOnUpdate="0" field="thickness" expression=""/>
+        <default applyOnUpdate="0" field="width" expression=""/>
+        <default applyOnUpdate="0" field="b" expression=""/>
+        <default applyOnUpdate="0" field="bulk" expression=""/>
+        <default applyOnUpdate="0" field="geom1" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="y_param" expression=""/>
+        <default applyOnUpdate="0" field="total_y" expression=""/>
+        <default applyOnUpdate="0" field="rec_y" expression=""/>
+        <default applyOnUpdate="0" field="geom1_ext" expression=""/>
+        <default applyOnUpdate="0" field="calculed_y" expression=""/>
+        <default applyOnUpdate="0" field="m3mlexc" expression=""/>
+        <default applyOnUpdate="0" field="m2mltrenchl" expression=""/>
+        <default applyOnUpdate="0" field="m2mlbottom" expression=""/>
+        <default applyOnUpdate="0" field="m2mlpav" expression=""/>
+        <default applyOnUpdate="0" field="m3mlprotec" expression=""/>
+        <default applyOnUpdate="0" field="m3mlfill" expression=""/>
+        <default applyOnUpdate="0" field="m3mlexcess" expression=""/>
+        <default applyOnUpdate="0" field="m3exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2trenchl_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2bottom_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2pav_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="pav_cost" expression=""/>
+        <default applyOnUpdate="0" field="exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="trenchl_cost" expression=""/>
+        <default applyOnUpdate="0" field="base_cost" expression=""/>
+        <default applyOnUpdate="0" field="protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="arc_cost" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="length" expression=""/>
+        <default applyOnUpdate="0" field="budget" expression=""/>
+        <default applyOnUpdate="0" field="other_budget" expression=""/>
+        <default applyOnUpdate="0" field="total_budget" expression=""/>
+        <default applyOnUpdate="0" field="builtcost" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="age" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
+        <default applyOnUpdate="0" field="aperiod" expression=""/>
+        <default applyOnUpdate="0" field="arate" expression=""/>
+        <default applyOnUpdate="0" field="amortized" expression=""/>
+        <default applyOnUpdate="0" field="pending" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="mean_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="thickness"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="width"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="b"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="bulk"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geom1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="y_param"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rec_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geom1_ext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="calculed_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlexc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2mltrenchl"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2mlbottom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2mlpav"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlprotec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlfill"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3mlexcess"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3exc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2trenchl_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2bottom_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m2pav_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3protec_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3fill_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="m3excess_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pav_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="trenchl_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="base_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="protec_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fill_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="excess_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other_budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="total_budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtcost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="aperiod"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="amortized"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pending"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mean_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="thickness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="width" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="b" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="bulk" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="area" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_param" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rec_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1_ext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="calculed_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlexc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mltrenchl" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mlbottom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mlpav" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlprotec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlfill" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlexcess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2trenchl_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2bottom_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2pav_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pav_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="trenchl_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="base_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other_budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtcost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="aperiod" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="amortized" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pending" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="y1"/>
-        <constraint desc="" exp="" field="y2"/>
-        <constraint desc="" exp="" field="mean_y"/>
-        <constraint desc="" exp="" field="z1"/>
-        <constraint desc="" exp="" field="z2"/>
-        <constraint desc="" exp="" field="thickness"/>
-        <constraint desc="" exp="" field="width"/>
-        <constraint desc="" exp="" field="b"/>
-        <constraint desc="" exp="" field="bulk"/>
-        <constraint desc="" exp="" field="geom1"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="y_param"/>
-        <constraint desc="" exp="" field="total_y"/>
-        <constraint desc="" exp="" field="rec_y"/>
-        <constraint desc="" exp="" field="geom1_ext"/>
-        <constraint desc="" exp="" field="calculed_y"/>
-        <constraint desc="" exp="" field="m3mlexc"/>
-        <constraint desc="" exp="" field="m2mltrenchl"/>
-        <constraint desc="" exp="" field="m2mlbottom"/>
-        <constraint desc="" exp="" field="m2mlpav"/>
-        <constraint desc="" exp="" field="m3mlprotec"/>
-        <constraint desc="" exp="" field="m3mlfill"/>
-        <constraint desc="" exp="" field="m3mlexcess"/>
-        <constraint desc="" exp="" field="m3exc_cost"/>
-        <constraint desc="" exp="" field="m2trenchl_cost"/>
-        <constraint desc="" exp="" field="m2bottom_cost"/>
-        <constraint desc="" exp="" field="m2pav_cost"/>
-        <constraint desc="" exp="" field="m3protec_cost"/>
-        <constraint desc="" exp="" field="m3fill_cost"/>
-        <constraint desc="" exp="" field="m3excess_cost"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="pav_cost"/>
-        <constraint desc="" exp="" field="exc_cost"/>
-        <constraint desc="" exp="" field="trenchl_cost"/>
-        <constraint desc="" exp="" field="base_cost"/>
-        <constraint desc="" exp="" field="protec_cost"/>
-        <constraint desc="" exp="" field="fill_cost"/>
-        <constraint desc="" exp="" field="excess_cost"/>
-        <constraint desc="" exp="" field="arc_cost"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="length"/>
-        <constraint desc="" exp="" field="budget"/>
-        <constraint desc="" exp="" field="other_budget"/>
-        <constraint desc="" exp="" field="total_budget"/>
-        <constraint desc="" exp="" field="builtcost"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="age"/>
-        <constraint desc="" exp="" field="acoeff"/>
-        <constraint desc="" exp="" field="aperiod"/>
-        <constraint desc="" exp="" field="arate"/>
-        <constraint desc="" exp="" field="amortized"/>
-        <constraint desc="" exp="" field="pending"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="y1" desc=""/>
+        <constraint exp="" field="y2" desc=""/>
+        <constraint exp="" field="mean_y" desc=""/>
+        <constraint exp="" field="z1" desc=""/>
+        <constraint exp="" field="z2" desc=""/>
+        <constraint exp="" field="thickness" desc=""/>
+        <constraint exp="" field="width" desc=""/>
+        <constraint exp="" field="b" desc=""/>
+        <constraint exp="" field="bulk" desc=""/>
+        <constraint exp="" field="geom1" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="y_param" desc=""/>
+        <constraint exp="" field="total_y" desc=""/>
+        <constraint exp="" field="rec_y" desc=""/>
+        <constraint exp="" field="geom1_ext" desc=""/>
+        <constraint exp="" field="calculed_y" desc=""/>
+        <constraint exp="" field="m3mlexc" desc=""/>
+        <constraint exp="" field="m2mltrenchl" desc=""/>
+        <constraint exp="" field="m2mlbottom" desc=""/>
+        <constraint exp="" field="m2mlpav" desc=""/>
+        <constraint exp="" field="m3mlprotec" desc=""/>
+        <constraint exp="" field="m3mlfill" desc=""/>
+        <constraint exp="" field="m3mlexcess" desc=""/>
+        <constraint exp="" field="m3exc_cost" desc=""/>
+        <constraint exp="" field="m2trenchl_cost" desc=""/>
+        <constraint exp="" field="m2bottom_cost" desc=""/>
+        <constraint exp="" field="m2pav_cost" desc=""/>
+        <constraint exp="" field="m3protec_cost" desc=""/>
+        <constraint exp="" field="m3fill_cost" desc=""/>
+        <constraint exp="" field="m3excess_cost" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="pav_cost" desc=""/>
+        <constraint exp="" field="exc_cost" desc=""/>
+        <constraint exp="" field="trenchl_cost" desc=""/>
+        <constraint exp="" field="base_cost" desc=""/>
+        <constraint exp="" field="protec_cost" desc=""/>
+        <constraint exp="" field="fill_cost" desc=""/>
+        <constraint exp="" field="excess_cost" desc=""/>
+        <constraint exp="" field="arc_cost" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="length" desc=""/>
+        <constraint exp="" field="budget" desc=""/>
+        <constraint exp="" field="other_budget" desc=""/>
+        <constraint exp="" field="total_budget" desc=""/>
+        <constraint exp="" field="builtcost" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="age" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
+        <constraint exp="" field="aperiod" desc=""/>
+        <constraint exp="" field="arate" desc=""/>
+        <constraint exp="" field="amortized" desc=""/>
+        <constraint exp="" field="pending" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -33113,62 +32570,70 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="node_1" width="-1"/>
-          <column type="field" hidden="0" name="node_2" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="y1" width="-1"/>
-          <column type="field" hidden="0" name="y2" width="-1"/>
-          <column type="field" hidden="0" name="mean_y" width="-1"/>
-          <column type="field" hidden="0" name="z1" width="-1"/>
-          <column type="field" hidden="0" name="z2" width="-1"/>
-          <column type="field" hidden="0" name="thickness" width="-1"/>
-          <column type="field" hidden="0" name="width" width="-1"/>
-          <column type="field" hidden="0" name="b" width="-1"/>
-          <column type="field" hidden="0" name="bulk" width="-1"/>
-          <column type="field" hidden="0" name="geom1" width="-1"/>
-          <column type="field" hidden="0" name="area" width="-1"/>
-          <column type="field" hidden="0" name="y_param" width="-1"/>
-          <column type="field" hidden="0" name="total_y" width="-1"/>
-          <column type="field" hidden="0" name="rec_y" width="-1"/>
-          <column type="field" hidden="0" name="geom1_ext" width="-1"/>
-          <column type="field" hidden="0" name="calculed_y" width="-1"/>
-          <column type="field" hidden="0" name="m3mlexc" width="-1"/>
-          <column type="field" hidden="0" name="m2mltrenchl" width="-1"/>
-          <column type="field" hidden="0" name="m2mlbottom" width="-1"/>
-          <column type="field" hidden="0" name="m2mlpav" width="-1"/>
-          <column type="field" hidden="0" name="m3mlprotec" width="-1"/>
-          <column type="field" hidden="0" name="m3mlfill" width="-1"/>
-          <column type="field" hidden="0" name="m3mlexcess" width="-1"/>
-          <column type="field" hidden="0" name="m3exc_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2trenchl_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2bottom_cost" width="-1"/>
-          <column type="field" hidden="0" name="m2pav_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3protec_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3fill_cost" width="-1"/>
-          <column type="field" hidden="0" name="m3excess_cost" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="-1"/>
-          <column type="field" hidden="0" name="pav_cost" width="-1"/>
-          <column type="field" hidden="0" name="exc_cost" width="-1"/>
-          <column type="field" hidden="0" name="trenchl_cost" width="-1"/>
-          <column type="field" hidden="0" name="base_cost" width="-1"/>
-          <column type="field" hidden="0" name="protec_cost" width="-1"/>
-          <column type="field" hidden="0" name="fill_cost" width="-1"/>
-          <column type="field" hidden="0" name="excess_cost" width="-1"/>
-          <column type="field" hidden="0" name="arc_cost" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="-1"/>
-          <column type="field" hidden="0" name="length" width="-1"/>
-          <column type="field" hidden="0" name="bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="other_bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="total_bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="y1"/>
+          <column type="field" width="-1" hidden="0" name="y2"/>
+          <column type="field" width="-1" hidden="0" name="mean_y"/>
+          <column type="field" width="-1" hidden="0" name="z1"/>
+          <column type="field" width="-1" hidden="0" name="z2"/>
+          <column type="field" width="-1" hidden="0" name="thickness"/>
+          <column type="field" width="-1" hidden="0" name="width"/>
+          <column type="field" width="-1" hidden="0" name="b"/>
+          <column type="field" width="-1" hidden="0" name="bulk"/>
+          <column type="field" width="-1" hidden="0" name="geom1"/>
+          <column type="field" width="-1" hidden="0" name="area"/>
+          <column type="field" width="-1" hidden="0" name="y_param"/>
+          <column type="field" width="-1" hidden="0" name="total_y"/>
+          <column type="field" width="-1" hidden="0" name="rec_y"/>
+          <column type="field" width="-1" hidden="0" name="geom1_ext"/>
+          <column type="field" width="-1" hidden="0" name="calculed_y"/>
+          <column type="field" width="-1" hidden="0" name="m3mlexc"/>
+          <column type="field" width="-1" hidden="0" name="m2mltrenchl"/>
+          <column type="field" width="-1" hidden="0" name="m2mlbottom"/>
+          <column type="field" width="-1" hidden="0" name="m2mlpav"/>
+          <column type="field" width="-1" hidden="0" name="m3mlprotec"/>
+          <column type="field" width="-1" hidden="0" name="m3mlfill"/>
+          <column type="field" width="-1" hidden="0" name="m3mlexcess"/>
+          <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2pav_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="pav_cost"/>
+          <column type="field" width="-1" hidden="0" name="exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="trenchl_cost"/>
+          <column type="field" width="-1" hidden="0" name="base_cost"/>
+          <column type="field" width="-1" hidden="0" name="protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="arc_cost"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="length"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="budget"/>
+          <column type="field" width="-1" hidden="0" name="other_budget"/>
+          <column type="field" width="-1" hidden="0" name="total_budget"/>
+          <column type="field" width="-1" hidden="0" name="builtcost"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="age"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
+          <column type="field" width="-1" hidden="0" name="aperiod"/>
+          <column type="field" width="-1" hidden="0" name="arate"/>
+          <column type="field" width="-1" hidden="0" name="amortized"/>
+          <column type="field" width="-1" hidden="0" name="pending"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -33200,7 +32665,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
+        <field name="age" editable="1"/>
+        <field name="amortized" editable="1"/>
         <field name="annotation" editable="0"/>
+        <field name="aperiod" editable="1"/>
+        <field name="arate" editable="1"/>
         <field name="arc_cost" editable="0"/>
         <field name="arc_id" editable="0"/>
         <field name="arc_type" editable="0"/>
@@ -33209,6 +32679,8 @@ def my_form_open(dialog, layer, feature):
         <field name="b" editable="0"/>
         <field name="base_cost" editable="0"/>
         <field name="budget" editable="0"/>
+        <field name="builtcost" editable="1"/>
+        <field name="builtdate" editable="1"/>
         <field name="bulk" editable="0"/>
         <field name="bSCHEMA_NAMEget" editable="0"/>
         <field name="calculed_y" editable="0"/>
@@ -33242,6 +32714,7 @@ def my_form_open(dialog, layer, feature):
         <field name="other_budget" editable="0"/>
         <field name="other_bSCHEMA_NAMEget" editable="0"/>
         <field name="pav_cost" editable="0"/>
+        <field name="pending" editable="1"/>
         <field name="protec_cost" editable="0"/>
         <field name="rec_y" editable="0"/>
         <field name="sector_id" editable="0"/>
@@ -33260,7 +32733,12 @@ def my_form_open(dialog, layer, feature):
         <field name="z2" editable="0"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
+        <field labelOnTop="0" name="age"/>
+        <field labelOnTop="0" name="amortized"/>
         <field labelOnTop="0" name="annotation"/>
+        <field labelOnTop="0" name="aperiod"/>
+        <field labelOnTop="0" name="arate"/>
         <field labelOnTop="0" name="arc_cost"/>
         <field labelOnTop="0" name="arc_id"/>
         <field labelOnTop="0" name="arc_type"/>
@@ -33268,6 +32746,9 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="area"/>
         <field labelOnTop="0" name="b"/>
         <field labelOnTop="0" name="base_cost"/>
+        <field labelOnTop="0" name="budget"/>
+        <field labelOnTop="0" name="builtcost"/>
+        <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="bulk"/>
         <field labelOnTop="0" name="bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="calculed_y"/>
@@ -33298,14 +32779,17 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="mean_y"/>
         <field labelOnTop="0" name="node_1"/>
         <field labelOnTop="0" name="node_2"/>
+        <field labelOnTop="0" name="other_budget"/>
         <field labelOnTop="0" name="other_bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="pav_cost"/>
+        <field labelOnTop="0" name="pending"/>
         <field labelOnTop="0" name="protec_cost"/>
         <field labelOnTop="0" name="rec_y"/>
         <field labelOnTop="0" name="sector_id"/>
         <field labelOnTop="0" name="soilcat_id"/>
         <field labelOnTop="0" name="state"/>
         <field labelOnTop="0" name="thickness"/>
+        <field labelOnTop="0" name="total_budget"/>
         <field labelOnTop="0" name="total_bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="total_y"/>
         <field labelOnTop="0" name="trenchl_cost"/>
@@ -33320,7 +32804,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="100000" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -33353,6 +32837,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -33366,10 +32859,18 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -33386,33 +32887,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33421,32 +32922,36 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -33455,8 +32960,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33465,8 +32970,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33475,8 +32980,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33485,8 +32990,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33495,8 +33000,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33505,50 +33010,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="OBSOLETE"/>
-                  <Option type="QString" value="1" name="ON_SERVICE"/>
-                  <Option type="QString" value="2" name="PLANIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="3" name="sector1-1d"/>
-                  <Option type="QString" value="1" name="sector1-1s"/>
-                  <Option type="QString" value="2" name="sector1-2s"/>
-                  <Option type="QString" value="5" name="sector2-1d"/>
-                  <Option type="QString" value="4" name="sector2-1s"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="Map" name="map">
-                  <Option type="QString" value="0" name="Undefined"/>
-                  <Option type="QString" value="1" name="expl_01"/>
-                  <Option type="QString" value="2" name="expl_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33557,8 +33050,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33567,8 +33060,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33577,8 +33070,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -33587,194 +33080,233 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtcost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="builtdate">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="age">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="aperiod">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="arate">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="amortized">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pending">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="nodecat_id" field="nodecat_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="top_elev" field="top_elev"/>
-        <alias index="4" name="elev" field="elev"/>
-        <alias index="5" name="epa_type" field="epa_type"/>
-        <alias index="6" name="state" field="state"/>
-        <alias index="7" name="sector_id" field="sector_id"/>
-        <alias index="8" name="expl_id" field="expl_id"/>
-        <alias index="9" name="cost_unit" field="cost_unit"/>
-        <alias index="10" name="descript" field="descript"/>
-        <alias index="11" name="measurement" field="measurement"/>
-        <alias index="12" name="cost" field="cost"/>
-        <alias index="13" name="budget" field="budget"/>
-        <alias index="14" name="" field="builtcost"/>
-        <alias index="15" name="" field="builtdate"/>
-        <alias index="16" name="" field="age"/>
-        <alias index="17" name="" field="acoeff"/>
-        <alias index="18" name="" field="aperiod"/>
-        <alias index="19" name="" field="arate"/>
-        <alias index="20" name="" field="amortized"/>
-        <alias index="21" name="" field="pending"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="nodecat_id" name="nodecat_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="top_elev" name="top_elev" index="3"/>
+        <alias field="elev" name="elev" index="4"/>
+        <alias field="epa_type" name="epa_type" index="5"/>
+        <alias field="state" name="state" index="6"/>
+        <alias field="sector_id" name="sector_id" index="7"/>
+        <alias field="expl_id" name="expl_id" index="8"/>
+        <alias field="cost_unit" name="cost_unit" index="9"/>
+        <alias field="descript" name="descript" index="10"/>
+        <alias field="measurement" name="measurement" index="11"/>
+        <alias field="cost" name="cost" index="12"/>
+        <alias field="budget" name="budget" index="13"/>
+        <alias field="builtcost" name="" index="14"/>
+        <alias field="builtdate" name="" index="15"/>
+        <alias field="age" name="" index="16"/>
+        <alias field="acoeff" name="" index="17"/>
+        <alias field="aperiod" name="" index="18"/>
+        <alias field="arate" name="" index="19"/>
+        <alias field="amortized" name="" index="20"/>
+        <alias field="pending" name="" index="21"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="top_elev" applyOnUpdate="0"/>
-        <default expression="" field="elev" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="cost_unit" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="measurement" applyOnUpdate="0"/>
-        <default expression="" field="cost" applyOnUpdate="0"/>
-        <default expression="" field="budget" applyOnUpdate="0"/>
-        <default expression="" field="builtcost" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="age" applyOnUpdate="0"/>
-        <default expression="" field="acoeff" applyOnUpdate="0"/>
-        <default expression="" field="aperiod" applyOnUpdate="0"/>
-        <default expression="" field="arate" applyOnUpdate="0"/>
-        <default expression="" field="amortized" applyOnUpdate="0"/>
-        <default expression="" field="pending" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="top_elev" expression=""/>
+        <default applyOnUpdate="0" field="elev" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="measurement" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="budget" expression=""/>
+        <default applyOnUpdate="0" field="builtcost" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="age" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
+        <default applyOnUpdate="0" field="aperiod" expression=""/>
+        <default applyOnUpdate="0" field="arate" expression=""/>
+        <default applyOnUpdate="0" field="amortized" expression=""/>
+        <default applyOnUpdate="0" field="pending" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="top_elev"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elev"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_unit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="measurement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="budget"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtcost"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="age"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="acoeff"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="aperiod"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="amortized"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pending"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="top_elev" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elev" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="measurement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtcost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="aperiod" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="amortized" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pending" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="top_elev"/>
-        <constraint desc="" exp="" field="elev"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="cost_unit"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="measurement"/>
-        <constraint desc="" exp="" field="cost"/>
-        <constraint desc="" exp="" field="budget"/>
-        <constraint desc="" exp="" field="builtcost"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="age"/>
-        <constraint desc="" exp="" field="acoeff"/>
-        <constraint desc="" exp="" field="aperiod"/>
-        <constraint desc="" exp="" field="arate"/>
-        <constraint desc="" exp="" field="amortized"/>
-        <constraint desc="" exp="" field="pending"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="top_elev" desc=""/>
+        <constraint exp="" field="elev" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="measurement" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="budget" desc=""/>
+        <constraint exp="" field="builtcost" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="age" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
+        <constraint exp="" field="aperiod" desc=""/>
+        <constraint exp="" field="arate" desc=""/>
+        <constraint exp="" field="amortized" desc=""/>
+        <constraint exp="" field="pending" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="top_elev" width="-1"/>
-          <column type="field" hidden="0" name="elev" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="cost_unit" width="122"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="calculated_depth" width="-1"/>
-          <column type="field" hidden="0" name="cost" width="-1"/>
-          <column type="field" hidden="0" name="bSCHEMA_NAMEget" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="top_elev"/>
+          <column type="field" width="-1" hidden="0" name="elev"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="122" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="measurement"/>
+          <column type="field" width="-1" hidden="0" name="budget"/>
+          <column type="field" width="-1" hidden="0" name="builtcost"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="age"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
+          <column type="field" width="-1" hidden="0" name="aperiod"/>
+          <column type="field" width="-1" hidden="0" name="arate"/>
+          <column type="field" width="-1" hidden="0" name="amortized"/>
+          <column type="field" width="-1" hidden="0" name="pending"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -33806,7 +33338,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="acoeff" editable="1"/>
+        <field name="age" editable="1"/>
+        <field name="amortized" editable="1"/>
+        <field name="aperiod" editable="1"/>
+        <field name="arate" editable="1"/>
         <field name="budget" editable="0"/>
+        <field name="builtcost" editable="1"/>
+        <field name="builtdate" editable="1"/>
         <field name="bSCHEMA_NAMEget" editable="0"/>
         <field name="cost" editable="0"/>
         <field name="cost_unit" editable="0"/>
@@ -33818,16 +33357,40 @@ def my_form_open(dialog, layer, feature):
         <field name="node_id" editable="0"/>
         <field name="node_type" editable="0"/>
         <field name="nodecat_id" editable="0"/>
+        <field name="pending" editable="1"/>
         <field name="sector_id" editable="0"/>
         <field name="state" editable="0"/>
         <field name="top_elev" editable="0"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
+        <field labelOnTop="0" name="age"/>
+        <field labelOnTop="0" name="amortized"/>
+        <field labelOnTop="0" name="aperiod"/>
+        <field labelOnTop="0" name="arate"/>
+        <field labelOnTop="0" name="budget"/>
+        <field labelOnTop="0" name="builtcost"/>
+        <field labelOnTop="0" name="builtdate"/>
+        <field labelOnTop="0" name="cost"/>
+        <field labelOnTop="0" name="cost_unit"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="elev"/>
+        <field labelOnTop="0" name="epa_type"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="measurement"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="node_type"/>
+        <field labelOnTop="0" name="nodecat_id"/>
+        <field labelOnTop="0" name="pending"/>
+        <field labelOnTop="0" name="sector_id"/>
+        <field labelOnTop="0" name="state"/>
+        <field labelOnTop="0" name="top_elev"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("descript", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc20180206173632206</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc" (the_geom) sql=</datasource>
       <keywordList>
@@ -33867,7 +33430,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -33887,162 +33450,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -34050,49 +33613,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -34104,28 +33667,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="arc_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -34134,8 +33697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -34261,116 +33824,116 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="arc_id" field="arc_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="arc_type" field="arc_type"/>
-        <alias index="3" name="arccat_id" field="arccat_id"/>
-        <alias index="4" name="max_flow" field="max_flow"/>
-        <alias index="5" name="min_flow" field="min_flow"/>
-        <alias index="6" name="max_vel" field="max_vel"/>
-        <alias index="7" name="min_vel" field="min_vel"/>
-        <alias index="8" name="max_headloss" field="max_headloss"/>
-        <alias index="9" name="min_headloss" field="min_headloss"/>
-        <alias index="10" name="max_uheadloss" field="max_uheadloss"/>
-        <alias index="11" name="min_uheadloss" field="min_uheadloss"/>
-        <alias index="12" name="max_setting" field="max_setting"/>
-        <alias index="13" name="min_setting" field="min_setting"/>
-        <alias index="14" name="max_reaction" field="max_reaction"/>
-        <alias index="15" name="min_reaction" field="min_reaction"/>
-        <alias index="16" name="max_ffactor" field="max_ffactor"/>
-        <alias index="17" name="min_ffactor" field="min_ffactor"/>
+        <alias field="arc_id" name="arc_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="arc_type" name="arc_type" index="2"/>
+        <alias field="arccat_id" name="arccat_id" index="3"/>
+        <alias field="max_flow" name="max_flow" index="4"/>
+        <alias field="min_flow" name="min_flow" index="5"/>
+        <alias field="max_vel" name="max_vel" index="6"/>
+        <alias field="min_vel" name="min_vel" index="7"/>
+        <alias field="max_headloss" name="max_headloss" index="8"/>
+        <alias field="min_headloss" name="min_headloss" index="9"/>
+        <alias field="max_uheadloss" name="max_uheadloss" index="10"/>
+        <alias field="min_uheadloss" name="min_uheadloss" index="11"/>
+        <alias field="max_setting" name="max_setting" index="12"/>
+        <alias field="min_setting" name="min_setting" index="13"/>
+        <alias field="max_reaction" name="max_reaction" index="14"/>
+        <alias field="min_reaction" name="min_reaction" index="15"/>
+        <alias field="max_ffactor" name="max_ffactor" index="16"/>
+        <alias field="min_ffactor" name="min_ffactor" index="17"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="max_flow" applyOnUpdate="0"/>
-        <default expression="" field="min_flow" applyOnUpdate="0"/>
-        <default expression="" field="max_vel" applyOnUpdate="0"/>
-        <default expression="" field="min_vel" applyOnUpdate="0"/>
-        <default expression="" field="max_headloss" applyOnUpdate="0"/>
-        <default expression="" field="min_headloss" applyOnUpdate="0"/>
-        <default expression="" field="max_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="min_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="max_setting" applyOnUpdate="0"/>
-        <default expression="" field="min_setting" applyOnUpdate="0"/>
-        <default expression="" field="max_reaction" applyOnUpdate="0"/>
-        <default expression="" field="min_reaction" applyOnUpdate="0"/>
-        <default expression="" field="max_ffactor" applyOnUpdate="0"/>
-        <default expression="" field="min_ffactor" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_ffactor"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="max_flow"/>
-        <constraint desc="" exp="" field="min_flow"/>
-        <constraint desc="" exp="" field="max_vel"/>
-        <constraint desc="" exp="" field="min_vel"/>
-        <constraint desc="" exp="" field="max_headloss"/>
-        <constraint desc="" exp="" field="min_headloss"/>
-        <constraint desc="" exp="" field="max_uheadloss"/>
-        <constraint desc="" exp="" field="min_uheadloss"/>
-        <constraint desc="" exp="" field="max_setting"/>
-        <constraint desc="" exp="" field="min_setting"/>
-        <constraint desc="" exp="" field="max_reaction"/>
-        <constraint desc="" exp="" field="min_reaction"/>
-        <constraint desc="" exp="" field="max_ffactor"/>
-        <constraint desc="" exp="" field="min_ffactor"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="max_flow" width="-1"/>
-          <column type="field" hidden="0" name="min_flow" width="-1"/>
-          <column type="field" hidden="0" name="max_vel" width="-1"/>
-          <column type="field" hidden="0" name="min_vel" width="-1"/>
-          <column type="field" hidden="0" name="max_headloss" width="-1"/>
-          <column type="field" hidden="0" name="min_headloss" width="-1"/>
-          <column type="field" hidden="0" name="max_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="min_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="max_setting" width="-1"/>
-          <column type="field" hidden="0" name="min_setting" width="-1"/>
-          <column type="field" hidden="0" name="max_reaction" width="-1"/>
-          <column type="field" hidden="0" name="min_reaction" width="-1"/>
-          <column type="field" hidden="0" name="max_ffactor" width="-1"/>
-          <column type="field" hidden="0" name="min_ffactor" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34426,7 +33989,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_all20180309112714512</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -34466,7 +34029,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -34486,31 +34049,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="20,173,40,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="20,173,40,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34523,7 +34086,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -34539,8 +34102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -34610,75 +34173,75 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="arc_type" field="arc_type"/>
-        <alias index="4" name="arccat_id" field="arccat_id"/>
-        <alias index="5" name="flow" field="flow"/>
-        <alias index="6" name="vel" field="vel"/>
-        <alias index="7" name="headloss" field="headloss"/>
-        <alias index="8" name="setting" field="setting"/>
-        <alias index="9" name="ffactor" field="ffactor"/>
-        <alias index="10" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="arc_type" name="arc_type" index="3"/>
+        <alias field="arccat_id" name="arccat_id" index="4"/>
+        <alias field="flow" name="flow" index="5"/>
+        <alias field="vel" name="vel" index="6"/>
+        <alias field="headloss" name="headloss" index="7"/>
+        <alias field="setting" name="setting" index="8"/>
+        <alias field="ffactor" name="ffactor" index="9"/>
+        <alias field="time" name="time" index="10"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="vel" applyOnUpdate="0"/>
-        <default expression="" field="headloss" applyOnUpdate="0"/>
-        <default expression="" field="setting" applyOnUpdate="0"/>
-        <default expression="" field="ffactor" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="vel"/>
-        <constraint desc="" exp="" field="headloss"/>
-        <constraint desc="" exp="" field="setting"/>
-        <constraint desc="" exp="" field="ffactor"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="flow" width="-1"/>
-          <column type="field" hidden="0" name="vel" width="-1"/>
-          <column type="field" hidden="0" name="headloss" width="-1"/>
-          <column type="field" hidden="0" name="setting" width="-1"/>
-          <column type="field" hidden="0" name="ffactor" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34711,7 +34274,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_hourly20180309112714378</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -34751,7 +34314,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -34771,162 +34334,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -34934,49 +34497,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -34988,28 +34551,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -35025,8 +34588,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -35082,71 +34645,71 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="flow" field="flow"/>
-        <alias index="4" name="vel" field="vel"/>
-        <alias index="5" name="headloss" field="headloss"/>
-        <alias index="6" name="setting" field="setting"/>
-        <alias index="7" name="ffactor" field="ffactor"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="flow" name="flow" index="3"/>
+        <alias field="vel" name="vel" index="4"/>
+        <alias field="headloss" name="headloss" index="5"/>
+        <alias field="setting" name="setting" index="6"/>
+        <alias field="ffactor" name="ffactor" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="vel" applyOnUpdate="0"/>
-        <default expression="" field="headloss" applyOnUpdate="0"/>
-        <default expression="" field="setting" applyOnUpdate="0"/>
-        <default expression="" field="ffactor" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="vel"/>
-        <constraint desc="" exp="" field="headloss"/>
-        <constraint desc="" exp="" field="setting"/>
-        <constraint desc="" exp="" field="ffactor"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{bc968d00-0198-4e46-9f58-2fe359b28284}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{bc968d00-0198-4e46-9f58-2fe359b28284}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="flow" width="-1"/>
-          <column type="field" hidden="0" name="vel" width="-1"/>
-          <column type="field" hidden="0" name="headloss" width="-1"/>
-          <column type="field" hidden="0" name="setting" width="-1"/>
-          <column type="field" hidden="0" name="ffactor" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -35193,7 +34756,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc20160710012004554</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_arc</shortname>
@@ -35234,7 +34797,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -35247,174 +34810,174 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <map-layer-style-manager current="arc maxheadloss">
         <map-layer-style name="% arc headloss">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_uheadloss" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_uheadloss" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.5 %" lower="0.000000000000000" upper="0.500000000000000" render="true"/>
-                <range symbol="1" label=" 0.5 - 1.0 %" lower="0.500000000000000" upper="1.000000000000000" render="true"/>
-                <range symbol="2" label=" 1.0 - 10.0 %" lower="1.000000000000000" upper="10.000000000000000" render="true"/>
-                <range symbol="3" label="> 10.0 %" lower="10.000000000000000" upper="100.000000000000000" render="true"/>
+                <range upper="0.500000000000000" render="true" lower="0.000000000000000" label="&lt; 0.5 %" symbol="0"/>
+                <range upper="1.000000000000000" render="true" lower="0.500000000000000" label=" 0.5 - 1.0 %" symbol="1"/>
+                <range upper="10.000000000000000" render="true" lower="1.000000000000000" label=" 1.0 - 10.0 %" symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="10.000000000000000" label="> 10.0 %" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="1" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="1" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -35564,37 +35127,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -35628,174 +35191,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="arc maxflow">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="-4.65661e-10" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_flow" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_flow" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.50 l/s" lower="-0.290000000000000" upper="0.500000000000000" render="true"/>
-                <range symbol="1" label="0.50 - 1.50 l/s" lower="0.500000000000000" upper="1.500000000000000" render="true"/>
-                <range symbol="2" label="1.50 - 2.50 l/s " lower="1.500000000000000" upper="2.500000000000000" render="true"/>
-                <range symbol="3" label="> 2.5 l/s" lower="2.500000000000000" upper="100.000000000000000" render="true"/>
+                <range upper="0.500000000000000" render="true" lower="-0.290000000000000" label="&lt; 0.50 l/s" symbol="0"/>
+                <range upper="1.500000000000000" render="true" lower="0.500000000000000" label="0.50 - 1.50 l/s" symbol="1"/>
+                <range upper="2.500000000000000" render="true" lower="1.500000000000000" label="1.50 - 2.50 l/s " symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="2.500000000000000" label="> 2.5 l/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="2" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -35945,37 +35508,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -36010,174 +35573,174 @@ def my_form_open(dialog, layer, feature):
         </map-layer-style>
         <map-layer-style name="arc maxheadloss"/>
         <map-layer-style name="arc maxvelocity">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_vel" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_vel" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.15 m/s" lower="0.000000000000000" upper="0.150000000000000" render="true"/>
-                <range symbol="1" label=" 0.15 - 0.30 m/s" lower="0.150000000000000" upper="0.300000000000000" render="true"/>
-                <range symbol="2" label=" 0.30 - 0.45 m/s " lower="0.300000000000000" upper="0.450000000000000" render="true"/>
-                <range symbol="3" label="> 0.45 m/s" lower="0.450000000000000" upper="2.000000000000000" render="true"/>
+                <range upper="0.150000000000000" render="true" lower="0.000000000000000" label="&lt; 0.15 m/s" symbol="0"/>
+                <range upper="0.300000000000000" render="true" lower="0.150000000000000" label=" 0.15 - 0.30 m/s" symbol="1"/>
+                <range upper="0.450000000000000" render="true" lower="0.300000000000000" label=" 0.30 - 0.45 m/s " symbol="2"/>
+                <range upper="2.000000000000000" render="true" lower="0.450000000000000" label="> 0.45 m/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="2" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -36327,37 +35890,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -36391,174 +35954,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="predeterminado">
-          <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.14.10-Essen" minimumScale="-4.65661e-10" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config labelOnTop="0" UseHtml="0" fieldEditable="1" IsMultiline="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
               <ranges>
-                <range symbol="0" label="&lt; 0.06" lower="0.000000000000000" upper="0.060000000000000" render="true"/>
-                <range symbol="1" label=" 0.06 - 0.12" lower="0.060000000000000" upper="0.120000000000000" render="true"/>
-                <range symbol="2" label=" 0.10 - 0.18" lower="0.120000000000000" upper="0.180000000000000" render="true"/>
-                <range symbol="3" label=" > 0.18" lower="0.180000000000000" upper="200.000000000000000" render="true"/>
+                <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06" symbol="0"/>
+                <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12" symbol="1"/>
+                <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.10 - 0.18" symbol="2"/>
+                <range upper="200.000000000000000" render="true" lower="0.180000000000000" label=" > 0.18" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="3">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleLine" pass="0" locked="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
               <colorramp type="gradient" name="[source]">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat trimtrailingzeroes="false" decimalplaces="0" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="0" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -36708,37 +36271,37 @@ def my_form_open(dialog, layer, feature):
             <displayfield>arc_id</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Etiqueta" fieldname=""/>
+              <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
-              <size units="pt" value="12" fieldname=""/>
+              <size fieldname="" units="pt" value="12"/>
               <bold on="0" fieldname=""/>
               <italic on="0" fieldname=""/>
               <underline on="0" fieldname=""/>
               <strikeout on="0" fieldname=""/>
-              <color blue="0" green="0" fieldname="" red="0"/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" green="255" fieldname="" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+              <angle fieldname="" auto="0" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
+              <buffersize fieldname="" units="pt" value="1"/>
               <bufferenabled on="" fieldname=""/>
               <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory backgroundAlpha="255" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" scaleBasedVisibility="0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" zIndex="0" placement="2"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -36778,162 +36341,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -36941,49 +36504,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -36995,28 +36558,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="arc_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -37025,8 +36588,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -37138,106 +36701,106 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="arc_id" field="arc_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="max_flow" field="max_flow"/>
-        <alias index="3" name="min_flow" field="min_flow"/>
-        <alias index="4" name="max_vel" field="max_vel"/>
-        <alias index="5" name="min_vel" field="min_vel"/>
-        <alias index="6" name="max_headloss" field="max_headloss"/>
-        <alias index="7" name="min_headloss" field="min_headloss"/>
-        <alias index="8" name="max_uheadloss" field="max_uheadloss"/>
-        <alias index="9" name="min_uheadloss" field="min_uheadloss"/>
-        <alias index="10" name="max_setting" field="max_setting"/>
-        <alias index="11" name="min_setting" field="min_setting"/>
-        <alias index="12" name="max_reaction" field="max_reaction"/>
-        <alias index="13" name="min_reaction" field="min_reaction"/>
-        <alias index="14" name="max_ffactor" field="max_ffactor"/>
-        <alias index="15" name="min_ffactor" field="min_ffactor"/>
+        <alias field="arc_id" name="arc_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="max_flow" name="max_flow" index="2"/>
+        <alias field="min_flow" name="min_flow" index="3"/>
+        <alias field="max_vel" name="max_vel" index="4"/>
+        <alias field="min_vel" name="min_vel" index="5"/>
+        <alias field="max_headloss" name="max_headloss" index="6"/>
+        <alias field="min_headloss" name="min_headloss" index="7"/>
+        <alias field="max_uheadloss" name="max_uheadloss" index="8"/>
+        <alias field="min_uheadloss" name="min_uheadloss" index="9"/>
+        <alias field="max_setting" name="max_setting" index="10"/>
+        <alias field="min_setting" name="min_setting" index="11"/>
+        <alias field="max_reaction" name="max_reaction" index="12"/>
+        <alias field="min_reaction" name="min_reaction" index="13"/>
+        <alias field="max_ffactor" name="max_ffactor" index="14"/>
+        <alias field="min_ffactor" name="min_ffactor" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="max_flow" applyOnUpdate="0"/>
-        <default expression="" field="min_flow" applyOnUpdate="0"/>
-        <default expression="" field="max_vel" applyOnUpdate="0"/>
-        <default expression="" field="min_vel" applyOnUpdate="0"/>
-        <default expression="" field="max_headloss" applyOnUpdate="0"/>
-        <default expression="" field="min_headloss" applyOnUpdate="0"/>
-        <default expression="" field="max_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="min_uheadloss" applyOnUpdate="0"/>
-        <default expression="" field="max_setting" applyOnUpdate="0"/>
-        <default expression="" field="min_setting" applyOnUpdate="0"/>
-        <default expression="" field="max_reaction" applyOnUpdate="0"/>
-        <default expression="" field="min_reaction" applyOnUpdate="0"/>
-        <default expression="" field="max_ffactor" applyOnUpdate="0"/>
-        <default expression="" field="min_ffactor" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_uheadloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_reaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_ffactor"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="max_flow"/>
-        <constraint desc="" exp="" field="min_flow"/>
-        <constraint desc="" exp="" field="max_vel"/>
-        <constraint desc="" exp="" field="min_vel"/>
-        <constraint desc="" exp="" field="max_headloss"/>
-        <constraint desc="" exp="" field="min_headloss"/>
-        <constraint desc="" exp="" field="max_uheadloss"/>
-        <constraint desc="" exp="" field="min_uheadloss"/>
-        <constraint desc="" exp="" field="max_setting"/>
-        <constraint desc="" exp="" field="min_setting"/>
-        <constraint desc="" exp="" field="max_reaction"/>
-        <constraint desc="" exp="" field="min_reaction"/>
-        <constraint desc="" exp="" field="max_ffactor"/>
-        <constraint desc="" exp="" field="min_ffactor"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="max_flow" width="-1"/>
-          <column type="field" hidden="0" name="min_flow" width="-1"/>
-          <column type="field" hidden="0" name="max_vel" width="-1"/>
-          <column type="field" hidden="0" name="min_vel" width="-1"/>
-          <column type="field" hidden="0" name="max_headloss" width="-1"/>
-          <column type="field" hidden="0" name="min_headloss" width="-1"/>
-          <column type="field" hidden="0" name="max_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="min_uheadloss" width="-1"/>
-          <column type="field" hidden="0" name="max_setting" width="-1"/>
-          <column type="field" hidden="0" name="min_setting" width="-1"/>
-          <column type="field" hidden="0" name="max_reaction" width="-1"/>
-          <column type="field" hidden="0" name="min_reaction" width="-1"/>
-          <column type="field" hidden="0" name="max_ffactor" width="-1"/>
-          <column type="field" hidden="0" name="min_ffactor" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -37291,7 +36854,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc_hourly20180309112714639</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -37331,7 +36894,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -37351,162 +36914,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_headloss" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="0.000000000000000" label="&lt; 0.06 mm/m" upper="0.060000000000000" render="true"/>
-          <range symbol="1" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" upper="0.120000000000000" render="true"/>
-          <range symbol="2" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " upper="0.180000000000000" render="true"/>
-          <range symbol="3" lower="0.180000000000000" label="> 0.18 mm/m" upper="200.000000000000000" render="true"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -37514,49 +37077,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="&quot;max_uheadloss&quot; || ' %'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -37568,28 +37131,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -37605,8 +37168,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -37662,71 +37225,71 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="arc_id" field="arc_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="flow" field="flow"/>
-        <alias index="4" name="vel" field="vel"/>
-        <alias index="5" name="headloss" field="headloss"/>
-        <alias index="6" name="setting" field="setting"/>
-        <alias index="7" name="ffactor" field="ffactor"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="arc_id" name="arc_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="flow" name="flow" index="3"/>
+        <alias field="vel" name="vel" index="4"/>
+        <alias field="headloss" name="headloss" index="5"/>
+        <alias field="setting" name="setting" index="6"/>
+        <alias field="ffactor" name="ffactor" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="flow" applyOnUpdate="0"/>
-        <default expression="" field="vel" applyOnUpdate="0"/>
-        <default expression="" field="headloss" applyOnUpdate="0"/>
-        <default expression="" field="setting" applyOnUpdate="0"/>
-        <default expression="" field="ffactor" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vel"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="headloss"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="setting"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ffactor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="flow"/>
-        <constraint desc="" exp="" field="vel"/>
-        <constraint desc="" exp="" field="headloss"/>
-        <constraint desc="" exp="" field="setting"/>
-        <constraint desc="" exp="" field="ffactor"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="flow" width="-1"/>
-          <column type="field" hidden="0" name="vel" width="-1"/>
-          <column type="field" hidden="0" name="headloss" width="-1"/>
-          <column type="field" hidden="0" name="setting" width="-1"/>
-          <column type="field" hidden="0" name="ffactor" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -37773,7 +37336,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_energy_usage20160710012004617</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_energy_usage" sql=</datasource>
       <shortname>v_rpt_comp_energy_usage</shortname>
@@ -37814,7 +37377,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -37835,7 +37398,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -37872,8 +37435,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -37908,65 +37471,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="nodarc_id" field="nodarc_id"/>
-        <alias index="3" name="usage_fact" field="usage_fact"/>
-        <alias index="4" name="avg_effic" field="avg_effic"/>
-        <alias index="5" name="kwhr_mgal" field="kwhr_mgal"/>
-        <alias index="6" name="avg_kw" field="avg_kw"/>
-        <alias index="7" name="peak_kw" field="peak_kw"/>
-        <alias index="8" name="cost_day" field="cost_day"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="nodarc_id" name="nodarc_id" index="2"/>
+        <alias field="usage_fact" name="usage_fact" index="3"/>
+        <alias field="avg_effic" name="avg_effic" index="4"/>
+        <alias field="kwhr_mgal" name="kwhr_mgal" index="5"/>
+        <alias field="avg_kw" name="avg_kw" index="6"/>
+        <alias field="peak_kw" name="peak_kw" index="7"/>
+        <alias field="cost_day" name="cost_day" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="nodarc_id" applyOnUpdate="0"/>
-        <default expression="" field="usage_fact" applyOnUpdate="0"/>
-        <default expression="" field="avg_effic" applyOnUpdate="0"/>
-        <default expression="" field="kwhr_mgal" applyOnUpdate="0"/>
-        <default expression="" field="avg_kw" applyOnUpdate="0"/>
-        <default expression="" field="peak_kw" applyOnUpdate="0"/>
-        <default expression="" field="cost_day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodarc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="usage_fact"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_effic"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="kwhr_mgal"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="peak_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_day"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="nodarc_id"/>
-        <constraint desc="" exp="" field="usage_fact"/>
-        <constraint desc="" exp="" field="avg_effic"/>
-        <constraint desc="" exp="" field="kwhr_mgal"/>
-        <constraint desc="" exp="" field="avg_kw"/>
-        <constraint desc="" exp="" field="peak_kw"/>
-        <constraint desc="" exp="" field="cost_day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="nodarc_id" width="-1"/>
-          <column type="field" hidden="0" name="usage_fact" width="-1"/>
-          <column type="field" hidden="0" name="avg_effic" width="-1"/>
-          <column type="field" hidden="0" name="kwhr_mgal" width="-1"/>
-          <column type="field" hidden="0" name="avg_kw" width="-1"/>
-          <column type="field" hidden="0" name="peak_kw" width="-1"/>
-          <column type="field" hidden="0" name="cost_day" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -37997,7 +37560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_hydraulic_status20160710012004648</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_hydraulic_status" sql=</datasource>
       <shortname>v_rpt_comp_hydraulic_status</shortname>
@@ -38038,7 +37601,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -38059,7 +37622,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -38068,8 +37631,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -38097,40 +37660,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="time" field="time"/>
-        <alias index="3" name="text" field="text"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="time" name="time" index="2"/>
+        <alias field="text" name="text" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="time"/>
-        <constraint desc="" exp="" field="text"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -38156,7 +37719,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node20160710012004695</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_node</shortname>
@@ -38197,7 +37760,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -38217,202 +37780,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -38420,49 +37983,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -38474,28 +38037,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -38593,81 +38156,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="nodecat_id" field="nodecat_id"/>
-        <alias index="4" name="elevation" field="elevation"/>
-        <alias index="5" name="max_demand" field="max_demand"/>
-        <alias index="6" name="min_demand" field="min_demand"/>
-        <alias index="7" name="max_head" field="max_head"/>
-        <alias index="8" name="min_head" field="min_head"/>
-        <alias index="9" name="max_pressure" field="max_pressure"/>
-        <alias index="10" name="min_pressure" field="min_pressure"/>
-        <alias index="11" name="max_quality" field="max_quality"/>
-        <alias index="12" name="min_quality" field="min_quality"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="nodecat_id" name="nodecat_id" index="3"/>
+        <alias field="elevation" name="elevation" index="4"/>
+        <alias field="max_demand" name="max_demand" index="5"/>
+        <alias field="min_demand" name="min_demand" index="6"/>
+        <alias field="max_head" name="max_head" index="7"/>
+        <alias field="min_head" name="min_head" index="8"/>
+        <alias field="max_pressure" name="max_pressure" index="9"/>
+        <alias field="min_pressure" name="min_pressure" index="10"/>
+        <alias field="max_quality" name="max_quality" index="11"/>
+        <alias field="min_quality" name="min_quality" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="min_demand" width="-1"/>
-          <column type="field" hidden="0" name="min_head" width="-1"/>
-          <column type="field" hidden="0" name="min_pressure" width="-1"/>
-          <column type="field" hidden="0" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="min_demand"/>
+          <column type="field" width="-1" hidden="0" name="min_head"/>
+          <column type="field" width="-1" hidden="0" name="min_pressure"/>
+          <column type="field" width="-1" hidden="0" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -38718,7 +38281,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_copiar20161230144859228</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -38758,7 +38321,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -38778,202 +38341,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -38981,49 +38544,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -39035,28 +38598,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39065,8 +38628,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39075,8 +38638,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39085,8 +38648,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39095,8 +38658,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39105,8 +38668,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39115,8 +38678,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39132,8 +38695,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39149,8 +38712,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39166,8 +38729,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39181,81 +38744,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="result_id"/>
-        <alias index="2" name="" field="node_type"/>
-        <alias index="3" name="" field="nodecat_id"/>
-        <alias index="4" name="" field="elevation"/>
-        <alias index="5" name="" field="max_demand"/>
-        <alias index="6" name="" field="min_demand"/>
-        <alias index="7" name="" field="max_head"/>
-        <alias index="8" name="" field="min_head"/>
-        <alias index="9" name="" field="max_pressure"/>
-        <alias index="10" name="" field="min_pressure"/>
-        <alias index="11" name="" field="max_quality"/>
-        <alias index="12" name="" field="min_quality"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="result_id" name="" index="1"/>
+        <alias field="node_type" name="" index="2"/>
+        <alias field="nodecat_id" name="" index="3"/>
+        <alias field="elevation" name="" index="4"/>
+        <alias field="max_demand" name="" index="5"/>
+        <alias field="min_demand" name="" index="6"/>
+        <alias field="max_head" name="" index="7"/>
+        <alias field="min_head" name="" index="8"/>
+        <alias field="max_pressure" name="" index="9"/>
+        <alias field="min_pressure" name="" index="10"/>
+        <alias field="max_quality" name="" index="11"/>
+        <alias field="min_quality" name="" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5b334259-4694-4093-810f-160d8a437c1d}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5b334259-4694-4093-810f-160d8a437c1d}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39292,7 +38855,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="0" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_hourly20180309112714764</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -39332,7 +38895,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -39352,33 +38915,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="211,184,132,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="211,184,132,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -39391,7 +38954,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39428,8 +38991,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39464,65 +39027,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="elevation" field="elevation"/>
-        <alias index="4" name="demand" field="demand"/>
-        <alias index="5" name="head" field="head"/>
-        <alias index="6" name="press" field="press"/>
-        <alias index="7" name="quality" field="quality"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="elevation" name="elevation" index="3"/>
+        <alias field="demand" name="demand" index="4"/>
+        <alias field="head" name="head" index="5"/>
+        <alias field="press" name="press" index="6"/>
+        <alias field="quality" name="quality" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="press" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="press"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="press"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="demand" width="-1"/>
-          <column type="field" hidden="0" name="head" width="-1"/>
-          <column type="field" hidden="0" name="press" width="-1"/>
-          <column type="field" hidden="0" name="quality" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="press"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39553,7 +39116,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_energy_usage20180201122650430</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_energy_usage" sql=</datasource>
       <keywordList>
@@ -39593,7 +39156,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -39614,7 +39177,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39651,8 +39214,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39687,65 +39250,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="nodarc_id" field="nodarc_id"/>
-        <alias index="3" name="usage_fact" field="usage_fact"/>
-        <alias index="4" name="avg_effic" field="avg_effic"/>
-        <alias index="5" name="kwhr_mgal" field="kwhr_mgal"/>
-        <alias index="6" name="avg_kw" field="avg_kw"/>
-        <alias index="7" name="peak_kw" field="peak_kw"/>
-        <alias index="8" name="cost_day" field="cost_day"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="nodarc_id" name="nodarc_id" index="2"/>
+        <alias field="usage_fact" name="usage_fact" index="3"/>
+        <alias field="avg_effic" name="avg_effic" index="4"/>
+        <alias field="kwhr_mgal" name="kwhr_mgal" index="5"/>
+        <alias field="avg_kw" name="avg_kw" index="6"/>
+        <alias field="peak_kw" name="peak_kw" index="7"/>
+        <alias field="cost_day" name="cost_day" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="nodarc_id" applyOnUpdate="0"/>
-        <default expression="" field="usage_fact" applyOnUpdate="0"/>
-        <default expression="" field="avg_effic" applyOnUpdate="0"/>
-        <default expression="" field="kwhr_mgal" applyOnUpdate="0"/>
-        <default expression="" field="avg_kw" applyOnUpdate="0"/>
-        <default expression="" field="peak_kw" applyOnUpdate="0"/>
-        <default expression="" field="cost_day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodarc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="usage_fact"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_effic"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="kwhr_mgal"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="avg_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="peak_kw"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cost_day"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="nodarc_id"/>
-        <constraint desc="" exp="" field="usage_fact"/>
-        <constraint desc="" exp="" field="avg_effic"/>
-        <constraint desc="" exp="" field="kwhr_mgal"/>
-        <constraint desc="" exp="" field="avg_kw"/>
-        <constraint desc="" exp="" field="peak_kw"/>
-        <constraint desc="" exp="" field="cost_day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="nodarc_id" width="-1"/>
-          <column type="field" hidden="0" name="usage_fact" width="-1"/>
-          <column type="field" hidden="0" name="avg_effic" width="-1"/>
-          <column type="field" hidden="0" name="kwhr_mgal" width="-1"/>
-          <column type="field" hidden="0" name="avg_kw" width="-1"/>
-          <column type="field" hidden="0" name="peak_kw" width="-1"/>
-          <column type="field" hidden="0" name="cost_day" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39776,7 +39339,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_hydraulic_status20131203141738132</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_hydraulic_status" sql=</datasource>
       <keywordList>
@@ -39816,7 +39379,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -39837,7 +39400,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -39846,8 +39409,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -39875,46 +39438,46 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="time" field="time"/>
-        <alias index="3" name="text" field="text"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="time" name="time" index="2"/>
+        <alias field="text" name="text" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
-        <default expression="" field="text" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="text"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="time"/>
-        <constraint desc="" exp="" field="text"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{678b4af2-e189-408a-baf7-c84b798c5250}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{678b4af2-e189-408a-baf7-c84b798c5250}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="id" width="-1"/>
-          <column type="field" hidden="0" name="result_id" width="-1"/>
-          <column type="field" hidden="0" name="time" width="-1"/>
-          <column type="field" hidden="0" name="text" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -39940,7 +39503,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node20180206173632034</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -39980,7 +39543,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -40000,202 +39563,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="min_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="min_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -40203,49 +39766,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="60,60,60,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="60,60,60,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -40257,28 +39820,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="node_id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -40376,81 +39939,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="node_id" field="node_id"/>
-        <alias index="1" name="result_id" field="result_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="nodecat_id" field="nodecat_id"/>
-        <alias index="4" name="elevation" field="elevation"/>
-        <alias index="5" name="max_demand" field="max_demand"/>
-        <alias index="6" name="min_demand" field="min_demand"/>
-        <alias index="7" name="max_head" field="max_head"/>
-        <alias index="8" name="min_head" field="min_head"/>
-        <alias index="9" name="max_pressure" field="max_pressure"/>
-        <alias index="10" name="min_pressure" field="min_pressure"/>
-        <alias index="11" name="max_quality" field="max_quality"/>
-        <alias index="12" name="min_quality" field="min_quality"/>
+        <alias field="node_id" name="node_id" index="0"/>
+        <alias field="result_id" name="result_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="nodecat_id" name="nodecat_id" index="3"/>
+        <alias field="elevation" name="elevation" index="4"/>
+        <alias field="max_demand" name="max_demand" index="5"/>
+        <alias field="min_demand" name="min_demand" index="6"/>
+        <alias field="max_head" name="max_head" index="7"/>
+        <alias field="min_head" name="min_head" index="8"/>
+        <alias field="max_pressure" name="max_pressure" index="9"/>
+        <alias field="min_pressure" name="min_pressure" index="10"/>
+        <alias field="max_quality" name="max_quality" index="11"/>
+        <alias field="min_quality" name="min_quality" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="max_demand" applyOnUpdate="0"/>
-        <default expression="" field="min_demand" applyOnUpdate="0"/>
-        <default expression="" field="max_head" applyOnUpdate="0"/>
-        <default expression="" field="min_head" applyOnUpdate="0"/>
-        <default expression="" field="max_pressure" applyOnUpdate="0"/>
-        <default expression="" field="min_pressure" applyOnUpdate="0"/>
-        <default expression="" field="max_quality" applyOnUpdate="0"/>
-        <default expression="" field="min_quality" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_quality"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="max_demand"/>
-        <constraint desc="" exp="" field="min_demand"/>
-        <constraint desc="" exp="" field="max_head"/>
-        <constraint desc="" exp="" field="min_head"/>
-        <constraint desc="" exp="" field="max_pressure"/>
-        <constraint desc="" exp="" field="min_pressure"/>
-        <constraint desc="" exp="" field="max_quality"/>
-        <constraint desc="" exp="" field="min_quality"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="max_demand" width="-1"/>
-          <column type="field" hidden="0" name="max_head" width="-1"/>
-          <column type="field" hidden="0" name="max_pressure" width="-1"/>
-          <column type="field" hidden="0" name="max_quality" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="max_demand"/>
+          <column type="field" width="-1" hidden="0" name="max_head"/>
+          <column type="field" width="-1" hidden="0" name="max_pressure"/>
+          <column type="field" width="-1" hidden="0" name="max_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -40501,7 +40064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "node_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_all20180309112714890</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -40541,7 +40104,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -40561,202 +40124,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -40764,49 +40327,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -40818,28 +40381,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -40890,8 +40453,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -40926,73 +40489,73 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="node_type" field="node_type"/>
-        <alias index="3" name="nodecat_id" field="nodecat_id"/>
-        <alias index="4" name="result_id" field="result_id"/>
-        <alias index="5" name="elevation" field="elevation"/>
-        <alias index="6" name="demand" field="demand"/>
-        <alias index="7" name="head" field="head"/>
-        <alias index="8" name="press" field="press"/>
-        <alias index="9" name="quality" field="quality"/>
-        <alias index="10" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="node_type" name="node_type" index="2"/>
+        <alias field="nodecat_id" name="nodecat_id" index="3"/>
+        <alias field="result_id" name="result_id" index="4"/>
+        <alias field="elevation" name="elevation" index="5"/>
+        <alias field="demand" name="demand" index="6"/>
+        <alias field="head" name="head" index="7"/>
+        <alias field="press" name="press" index="8"/>
+        <alias field="quality" name="quality" index="9"/>
+        <alias field="time" name="time" index="10"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="press" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="press"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="press"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -41041,7 +40604,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="-4.65661e-10" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_hourly20180309112715024</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -41081,7 +40644,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -41101,202 +40664,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="max_pressure" type="graduatedSymbol" forceraster="0" symbollevels="0" graduatedMethod="GraduatedColor" enableorderby="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range symbol="0" lower="-10000.000000000000000" label="Negative pressures" upper="0.000000000000000" render="true"/>
-          <range symbol="1" lower="0.000000000000000" label="0-15 wcm" upper="15.000000000000000" render="true"/>
-          <range symbol="2" lower="15.000000000000000" label="15-60 wcm" upper="60.000000000000000" render="true"/>
-          <range symbol="3" lower="60.000000000000000" label="60-75 wcm" upper="75.000000000000000" render="true"/>
-          <range symbol="4" lower="75.000000000000000" label="> 75 wcm" upper="10000.000000000000000" render="true"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
         <colorramp type="gradient" name="[source]">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
           <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
-          <labelFormat trimtrailingzeroes="1" format="%1 - %2 " labelprecision="4"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -41304,49 +40867,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="55,55,55,255" isExpression="1" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="Arial" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="7" blendMode="0" namedStyle="Bold">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="_" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="0" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -41358,28 +40921,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="-4.65661e-10" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -41416,8 +40979,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -41452,65 +41015,65 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="id" field="id"/>
-        <alias index="1" name="node_id" field="node_id"/>
-        <alias index="2" name="result_id" field="result_id"/>
-        <alias index="3" name="elevation" field="elevation"/>
-        <alias index="4" name="demand" field="demand"/>
-        <alias index="5" name="head" field="head"/>
-        <alias index="6" name="press" field="press"/>
-        <alias index="7" name="quality" field="quality"/>
-        <alias index="8" name="time" field="time"/>
+        <alias field="id" name="id" index="0"/>
+        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="result_id" name="result_id" index="2"/>
+        <alias field="elevation" name="elevation" index="3"/>
+        <alias field="demand" name="demand" index="4"/>
+        <alias field="head" name="head" index="5"/>
+        <alias field="press" name="press" index="6"/>
+        <alias field="quality" name="quality" index="7"/>
+        <alias field="time" name="time" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="result_id" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="demand" applyOnUpdate="0"/>
-        <default expression="" field="head" applyOnUpdate="0"/>
-        <default expression="" field="press" applyOnUpdate="0"/>
-        <default expression="" field="quality" applyOnUpdate="0"/>
-        <default expression="" field="time" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="result_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="demand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="head"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="press"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quality"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="time"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="result_id"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="demand"/>
-        <constraint desc="" exp="" field="head"/>
-        <constraint desc="" exp="" field="press"/>
-        <constraint desc="" exp="" field="quality"/>
-        <constraint desc="" exp="" field="time"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting type="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" isEnabledOnlyWhenEditable="0" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}" icon="" capture="0" notificationMessage="">
-          <actionScope id="Canvas"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}">
           <actionScope id="Field"/>
+          <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="1" name="min_demand" width="-1"/>
-          <column type="field" hidden="1" name="min_head" width="-1"/>
-          <column type="field" hidden="1" name="min_pressure" width="-1"/>
-          <column type="field" hidden="1" name="min_quality" width="-1"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -41557,7 +41120,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -41616,7 +41179,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -41640,119 +41203,119 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 attr="state" type="categorizedSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="state" symbollevels="0">
         <categories>
-          <category symbol="0" label="Obsolete" value="0" render="true"/>
-          <category symbol="1" label="On service" value="1" render="true"/>
-          <category symbol="2" label="Planified" value="2" render="true"/>
+          <category render="true" value="0" label="Obsolete" symbol="0"/>
+          <category render="true" value="1" label="On service" symbol="1"/>
+          <category render="true" value="2" label="Planified" symbol="2"/>
         </categories>
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="9,79,220,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.36"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="9,79,220,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.36" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -41763,79 +41326,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="arccat_id" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="213,180,60,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="213,180,60,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="LineGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="1000" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -41848,22 +41411,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -42444,342 +42007,342 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="node_1"/>
-        <alias index="3" name="" field="node_2"/>
-        <alias index="4" name="" field="elevation1"/>
-        <alias index="5" name="" field="depth1"/>
-        <alias index="6" name="" field="elevation2"/>
-        <alias index="7" name="" field="depth2"/>
-        <alias index="8" name="" field="arccat_id"/>
-        <alias index="9" name="" field="arc_type"/>
-        <alias index="10" name="" field="sys_type"/>
-        <alias index="11" name="" field="cat_matcat_id"/>
-        <alias index="12" name="" field="cat_pnom"/>
-        <alias index="13" name="" field="cat_dnom"/>
-        <alias index="14" name="" field="epa_type"/>
-        <alias index="15" name="" field="expl_id"/>
-        <alias index="16" name="" field="macroexpl_id"/>
-        <alias index="17" name="" field="sector_id"/>
-        <alias index="18" name="" field="sector_name"/>
-        <alias index="19" name="" field="macrosector_id"/>
-        <alias index="20" name="" field="state"/>
-        <alias index="21" name="" field="state_type"/>
-        <alias index="22" name="" field="annotation"/>
-        <alias index="23" name="" field="observ"/>
-        <alias index="24" name="" field="comment"/>
-        <alias index="25" name="" field="gis_length"/>
-        <alias index="26" name="" field="custom_length"/>
-        <alias index="27" name="" field="minsector_id"/>
-        <alias index="28" name="" field="dma_id"/>
-        <alias index="29" name="" field="dma_name"/>
-        <alias index="30" name="" field="macrodma_id"/>
-        <alias index="31" name="" field="presszone_id"/>
-        <alias index="32" name="" field="presszone_name"/>
-        <alias index="33" name="" field="dqa_id"/>
-        <alias index="34" name="" field="dqa_name"/>
-        <alias index="35" name="" field="macrodqa_id"/>
-        <alias index="36" name="" field="soilcat_id"/>
-        <alias index="37" name="" field="function_type"/>
-        <alias index="38" name="" field="category_type"/>
-        <alias index="39" name="" field="fluid_type"/>
-        <alias index="40" name="" field="location_type"/>
-        <alias index="41" name="" field="workcat_id"/>
-        <alias index="42" name="" field="workcat_id_end"/>
-        <alias index="43" name="" field="buildercat_id"/>
-        <alias index="44" name="" field="builtdate"/>
-        <alias index="45" name="" field="enddate"/>
-        <alias index="46" name="" field="ownercat_id"/>
-        <alias index="47" name="" field="muni_id"/>
-        <alias index="48" name="" field="postcode"/>
-        <alias index="49" name="" field="district_id"/>
-        <alias index="50" name="" field="streetname"/>
-        <alias index="51" name="" field="postnumber"/>
-        <alias index="52" name="" field="postcomplement"/>
-        <alias index="53" name="" field="streetname2"/>
-        <alias index="54" name="" field="postnumber2"/>
-        <alias index="55" name="" field="postcomplement2"/>
-        <alias index="56" name="" field="descript"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="cat_arctype_id"/>
-        <alias index="68" name="" field="nodetype_1"/>
-        <alias index="69" name="" field="staticpress1"/>
-        <alias index="70" name="" field="nodetype_2"/>
-        <alias index="71" name="" field="staticpress2"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="depth"/>
-        <alias index="77" name="" field="adate"/>
-        <alias index="78" name="" field="adescript"/>
-        <alias index="79" name="" field="dma_style"/>
-        <alias index="80" name="" field="presszone_style"/>
-        <alias index="81" name="" field="pipe_param_1"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="node_1" name="" index="2"/>
+        <alias field="node_2" name="" index="3"/>
+        <alias field="elevation1" name="" index="4"/>
+        <alias field="depth1" name="" index="5"/>
+        <alias field="elevation2" name="" index="6"/>
+        <alias field="depth2" name="" index="7"/>
+        <alias field="arccat_id" name="" index="8"/>
+        <alias field="arc_type" name="" index="9"/>
+        <alias field="sys_type" name="" index="10"/>
+        <alias field="cat_matcat_id" name="" index="11"/>
+        <alias field="cat_pnom" name="" index="12"/>
+        <alias field="cat_dnom" name="" index="13"/>
+        <alias field="epa_type" name="" index="14"/>
+        <alias field="expl_id" name="" index="15"/>
+        <alias field="macroexpl_id" name="" index="16"/>
+        <alias field="sector_id" name="" index="17"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
+        <alias field="pipe_param_1" name="" index="81"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="elevation1" applyOnUpdate="0"/>
-        <default expression="" field="depth1" applyOnUpdate="0"/>
-        <default expression="" field="elevation2" applyOnUpdate="0"/>
-        <default expression="" field="depth2" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="gis_length" applyOnUpdate="0"/>
-        <default expression="" field="custom_length" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="cat_arctype_id" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_1" applyOnUpdate="0"/>
-        <default expression="" field="staticpress1" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_2" applyOnUpdate="0"/>
-        <default expression="" field="staticpress2" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="pipe_param_1" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="pipe_param_1" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gis_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_arctype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pipe_param_1"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pipe_param_1" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="elevation1"/>
-        <constraint desc="" exp="" field="depth1"/>
-        <constraint desc="" exp="" field="elevation2"/>
-        <constraint desc="" exp="" field="depth2"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="gis_length"/>
-        <constraint desc="" exp="" field="custom_length"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="cat_arctype_id"/>
-        <constraint desc="" exp="" field="nodetype_1"/>
-        <constraint desc="" exp="" field="staticpress1"/>
-        <constraint desc="" exp="" field="nodetype_2"/>
-        <constraint desc="" exp="" field="staticpress2"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="pipe_param_1"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="pipe_param_1" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -42787,80 +42350,80 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="node_1" width="-1"/>
-          <column type="field" hidden="0" name="node_2" width="-1"/>
-          <column type="field" hidden="0" name="elevation1" width="-1"/>
-          <column type="field" hidden="0" name="depth1" width="-1"/>
-          <column type="field" hidden="0" name="elevation2" width="-1"/>
-          <column type="field" hidden="0" name="depth2" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="gis_length" width="-1"/>
-          <column type="field" hidden="0" name="custom_length" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="cat_arctype_id" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_1" width="-1"/>
-          <column type="field" hidden="0" name="staticpress1" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_2" width="-1"/>
-          <column type="field" hidden="0" name="staticpress2" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="pipe_param_1" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="pipe_param_1"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -43045,7 +42608,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Line" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="LineString" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -43104,7 +42667,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -43128,37 +42691,37 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" alpha="0.694118" force_rhr="0" name="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="0.694118" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineWidth">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -43175,22 +42738,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="2">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -43764,338 +43327,338 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="arc_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="node_1"/>
-        <alias index="3" name="" field="node_2"/>
-        <alias index="4" name="" field="elevation1"/>
-        <alias index="5" name="" field="depth1"/>
-        <alias index="6" name="" field="elevation2"/>
-        <alias index="7" name="" field="depth2"/>
-        <alias index="8" name="" field="arccat_id"/>
-        <alias index="9" name="" field="arc_type"/>
-        <alias index="10" name="" field="sys_type"/>
-        <alias index="11" name="" field="cat_matcat_id"/>
-        <alias index="12" name="" field="cat_pnom"/>
-        <alias index="13" name="" field="cat_dnom"/>
-        <alias index="14" name="" field="epa_type"/>
-        <alias index="15" name="" field="expl_id"/>
-        <alias index="16" name="" field="macroexpl_id"/>
-        <alias index="17" name="" field="sector_id"/>
-        <alias index="18" name="" field="sector_name"/>
-        <alias index="19" name="" field="macrosector_id"/>
-        <alias index="20" name="" field="state"/>
-        <alias index="21" name="" field="state_type"/>
-        <alias index="22" name="" field="annotation"/>
-        <alias index="23" name="" field="observ"/>
-        <alias index="24" name="" field="comment"/>
-        <alias index="25" name="" field="gis_length"/>
-        <alias index="26" name="" field="custom_length"/>
-        <alias index="27" name="" field="minsector_id"/>
-        <alias index="28" name="" field="dma_id"/>
-        <alias index="29" name="" field="dma_name"/>
-        <alias index="30" name="" field="macrodma_id"/>
-        <alias index="31" name="" field="presszone_id"/>
-        <alias index="32" name="" field="presszone_name"/>
-        <alias index="33" name="" field="dqa_id"/>
-        <alias index="34" name="" field="dqa_name"/>
-        <alias index="35" name="" field="macrodqa_id"/>
-        <alias index="36" name="" field="soilcat_id"/>
-        <alias index="37" name="" field="function_type"/>
-        <alias index="38" name="" field="category_type"/>
-        <alias index="39" name="" field="fluid_type"/>
-        <alias index="40" name="" field="location_type"/>
-        <alias index="41" name="" field="workcat_id"/>
-        <alias index="42" name="" field="workcat_id_end"/>
-        <alias index="43" name="" field="buildercat_id"/>
-        <alias index="44" name="" field="builtdate"/>
-        <alias index="45" name="" field="enddate"/>
-        <alias index="46" name="" field="ownercat_id"/>
-        <alias index="47" name="" field="muni_id"/>
-        <alias index="48" name="" field="postcode"/>
-        <alias index="49" name="" field="district_id"/>
-        <alias index="50" name="" field="streetname"/>
-        <alias index="51" name="" field="postnumber"/>
-        <alias index="52" name="" field="postcomplement"/>
-        <alias index="53" name="" field="streetname2"/>
-        <alias index="54" name="" field="postnumber2"/>
-        <alias index="55" name="" field="postcomplement2"/>
-        <alias index="56" name="" field="descript"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="cat_arctype_id"/>
-        <alias index="68" name="" field="nodetype_1"/>
-        <alias index="69" name="" field="staticpress1"/>
-        <alias index="70" name="" field="nodetype_2"/>
-        <alias index="71" name="" field="staticpress2"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="depth"/>
-        <alias index="77" name="" field="adate"/>
-        <alias index="78" name="" field="adescript"/>
-        <alias index="79" name="" field="dma_style"/>
-        <alias index="80" name="" field="presszone_style"/>
+        <alias field="arc_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="node_1" name="" index="2"/>
+        <alias field="node_2" name="" index="3"/>
+        <alias field="elevation1" name="" index="4"/>
+        <alias field="depth1" name="" index="5"/>
+        <alias field="elevation2" name="" index="6"/>
+        <alias field="depth2" name="" index="7"/>
+        <alias field="arccat_id" name="" index="8"/>
+        <alias field="arc_type" name="" index="9"/>
+        <alias field="sys_type" name="" index="10"/>
+        <alias field="cat_matcat_id" name="" index="11"/>
+        <alias field="cat_pnom" name="" index="12"/>
+        <alias field="cat_dnom" name="" index="13"/>
+        <alias field="epa_type" name="" index="14"/>
+        <alias field="expl_id" name="" index="15"/>
+        <alias field="macroexpl_id" name="" index="16"/>
+        <alias field="sector_id" name="" index="17"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="node_1" applyOnUpdate="0"/>
-        <default expression="" field="node_2" applyOnUpdate="0"/>
-        <default expression="" field="elevation1" applyOnUpdate="0"/>
-        <default expression="" field="depth1" applyOnUpdate="0"/>
-        <default expression="" field="elevation2" applyOnUpdate="0"/>
-        <default expression="" field="depth2" applyOnUpdate="0"/>
-        <default expression="" field="arccat_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="gis_length" applyOnUpdate="0"/>
-        <default expression="" field="custom_length" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="cat_arctype_id" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_1" applyOnUpdate="0"/>
-        <default expression="" field="staticpress1" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_2" applyOnUpdate="0"/>
-        <default expression="" field="staticpress2" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arccat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="gis_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="custom_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_arctype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpress2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="node_1"/>
-        <constraint desc="" exp="" field="node_2"/>
-        <constraint desc="" exp="" field="elevation1"/>
-        <constraint desc="" exp="" field="depth1"/>
-        <constraint desc="" exp="" field="elevation2"/>
-        <constraint desc="" exp="" field="depth2"/>
-        <constraint desc="" exp="" field="arccat_id"/>
-        <constraint desc="" exp="" field="arc_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="gis_length"/>
-        <constraint desc="" exp="" field="custom_length"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="cat_arctype_id"/>
-        <constraint desc="" exp="" field="nodetype_1"/>
-        <constraint desc="" exp="" field="staticpress1"/>
-        <constraint desc="" exp="" field="nodetype_2"/>
-        <constraint desc="" exp="" field="staticpress2"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -44103,79 +43666,79 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="node_1" width="-1"/>
-          <column type="field" hidden="0" name="node_2" width="-1"/>
-          <column type="field" hidden="0" name="elevation1" width="-1"/>
-          <column type="field" hidden="0" name="depth1" width="-1"/>
-          <column type="field" hidden="0" name="elevation2" width="-1"/>
-          <column type="field" hidden="0" name="depth2" width="-1"/>
-          <column type="field" hidden="0" name="arccat_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="gis_length" width="-1"/>
-          <column type="field" hidden="0" name="custom_length" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="cat_arctype_id" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_1" width="-1"/>
-          <column type="field" hidden="0" name="staticpress1" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_2" width="-1"/>
-          <column type="field" hidden="0" name="staticpress2" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -44358,9 +43921,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" readOnly="0" maxScale="0" hasScaleBasedVisibilityFlag="0" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_config_sysfields" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='rid' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_config_sysfields" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -44375,7 +43938,7 @@ def my_form_open(dialog, layer, feature):
           <description></description>
           <projectionacronym></projectionacronym>
           <ellipsoidacronym></ellipsoidacronym>
-          <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+          <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -44398,7 +43961,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -44419,11 +43982,9 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value>"formname"</value>
-        </property>
+        <property key="dualview/previewExpressions" value="&quot;formname&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -44628,126 +44189,126 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="rid"/>
-        <alias index="1" name="" field="formname"/>
-        <alias index="2" name="" field="formtype"/>
-        <alias index="3" name="" field="columnname"/>
-        <alias index="4" name="" field="label"/>
-        <alias index="5" name="" field="hidden"/>
-        <alias index="6" name="" field="layoutname"/>
-        <alias index="7" name="" field="layoutorder"/>
-        <alias index="8" name="" field="iseditable"/>
-        <alias index="9" name="" field="ismandatory"/>
-        <alias index="10" name="" field="datatype"/>
-        <alias index="11" name="" field="widgettype"/>
-        <alias index="12" name="" field="widgetdim"/>
-        <alias index="13" name="" field="tooltip"/>
-        <alias index="14" name="" field="placeholder"/>
-        <alias index="15" name="" field="stylesheet"/>
-        <alias index="16" name="" field="isparent"/>
-        <alias index="17" name="" field="isautoupdate"/>
-        <alias index="18" name="" field="dv_querytext"/>
-        <alias index="19" name="" field="dv_orderby_id"/>
-        <alias index="20" name="" field="dv_isnullvalue"/>
-        <alias index="21" name="" field="dv_parent_id"/>
-        <alias index="22" name="" field="dv_querytext_filterc"/>
-        <alias index="23" name="" field="widgetcontrols"/>
-        <alias index="24" name="" field="widgetfunction"/>
-        <alias index="25" name="" field="linkedaction"/>
-        <alias index="26" name="" field="listfilterparam"/>
-        <alias index="27" name="" field="cat_feature_id"/>
+        <alias field="rid" name="" index="0"/>
+        <alias field="formname" name="" index="1"/>
+        <alias field="formtype" name="" index="2"/>
+        <alias field="columnname" name="" index="3"/>
+        <alias field="label" name="" index="4"/>
+        <alias field="hidden" name="" index="5"/>
+        <alias field="layoutname" name="" index="6"/>
+        <alias field="layoutorder" name="" index="7"/>
+        <alias field="iseditable" name="" index="8"/>
+        <alias field="ismandatory" name="" index="9"/>
+        <alias field="datatype" name="" index="10"/>
+        <alias field="widgettype" name="" index="11"/>
+        <alias field="widgetdim" name="" index="12"/>
+        <alias field="tooltip" name="" index="13"/>
+        <alias field="placeholder" name="" index="14"/>
+        <alias field="stylesheet" name="" index="15"/>
+        <alias field="isparent" name="" index="16"/>
+        <alias field="isautoupdate" name="" index="17"/>
+        <alias field="dv_querytext" name="" index="18"/>
+        <alias field="dv_orderby_id" name="" index="19"/>
+        <alias field="dv_isnullvalue" name="" index="20"/>
+        <alias field="dv_parent_id" name="" index="21"/>
+        <alias field="dv_querytext_filterc" name="" index="22"/>
+        <alias field="widgetcontrols" name="" index="23"/>
+        <alias field="widgetfunction" name="" index="24"/>
+        <alias field="linkedaction" name="" index="25"/>
+        <alias field="listfilterparam" name="" index="26"/>
+        <alias field="cat_feature_id" name="" index="27"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="rid" applyOnUpdate="0"/>
-        <default expression="" field="formname" applyOnUpdate="0"/>
-        <default expression="" field="formtype" applyOnUpdate="0"/>
-        <default expression="" field="columnname" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="hidden" applyOnUpdate="0"/>
-        <default expression="" field="layoutname" applyOnUpdate="0"/>
-        <default expression="" field="layoutorder" applyOnUpdate="0"/>
-        <default expression="" field="iseditable" applyOnUpdate="0"/>
-        <default expression="" field="ismandatory" applyOnUpdate="0"/>
-        <default expression="" field="datatype" applyOnUpdate="0"/>
-        <default expression="" field="widgettype" applyOnUpdate="0"/>
-        <default expression="" field="widgetdim" applyOnUpdate="0"/>
-        <default expression="" field="tooltip" applyOnUpdate="0"/>
-        <default expression="" field="placeholder" applyOnUpdate="0"/>
-        <default expression="" field="stylesheet" applyOnUpdate="0"/>
-        <default expression="" field="isparent" applyOnUpdate="0"/>
-        <default expression="" field="isautoupdate" applyOnUpdate="0"/>
-        <default expression="" field="dv_querytext" applyOnUpdate="0"/>
-        <default expression="" field="dv_orderby_id" applyOnUpdate="0"/>
-        <default expression="" field="dv_isnullvalue" applyOnUpdate="0"/>
-        <default expression="" field="dv_parent_id" applyOnUpdate="0"/>
-        <default expression="" field="dv_querytext_filterc" applyOnUpdate="0"/>
-        <default expression="" field="widgetcontrols" applyOnUpdate="0"/>
-        <default expression="" field="widgetfunction" applyOnUpdate="0"/>
-        <default expression="" field="linkedaction" applyOnUpdate="0"/>
-        <default expression="" field="listfilterparam" applyOnUpdate="0"/>
-        <default expression="" field="cat_feature_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="rid" expression=""/>
+        <default applyOnUpdate="0" field="formname" expression=""/>
+        <default applyOnUpdate="0" field="formtype" expression=""/>
+        <default applyOnUpdate="0" field="columnname" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="hidden" expression=""/>
+        <default applyOnUpdate="0" field="layoutname" expression=""/>
+        <default applyOnUpdate="0" field="layoutorder" expression=""/>
+        <default applyOnUpdate="0" field="iseditable" expression=""/>
+        <default applyOnUpdate="0" field="ismandatory" expression=""/>
+        <default applyOnUpdate="0" field="datatype" expression=""/>
+        <default applyOnUpdate="0" field="widgettype" expression=""/>
+        <default applyOnUpdate="0" field="widgetdim" expression=""/>
+        <default applyOnUpdate="0" field="tooltip" expression=""/>
+        <default applyOnUpdate="0" field="placeholder" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
+        <default applyOnUpdate="0" field="isparent" expression=""/>
+        <default applyOnUpdate="0" field="isautoupdate" expression=""/>
+        <default applyOnUpdate="0" field="dv_querytext" expression=""/>
+        <default applyOnUpdate="0" field="dv_orderby_id" expression=""/>
+        <default applyOnUpdate="0" field="dv_isnullvalue" expression=""/>
+        <default applyOnUpdate="0" field="dv_parent_id" expression=""/>
+        <default applyOnUpdate="0" field="dv_querytext_filterc" expression=""/>
+        <default applyOnUpdate="0" field="widgetcontrols" expression=""/>
+        <default applyOnUpdate="0" field="widgetfunction" expression=""/>
+        <default applyOnUpdate="0" field="linkedaction" expression=""/>
+        <default applyOnUpdate="0" field="listfilterparam" expression=""/>
+        <default applyOnUpdate="0" field="cat_feature_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="rid"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="formname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="formtype"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="columnname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hidden"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="layoutname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="layoutorder"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="iseditable"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ismandatory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="datatype"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgettype"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgetdim"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tooltip"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="placeholder"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="stylesheet"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="isparent"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="isautoupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_querytext"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_orderby_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_isnullvalue"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dv_querytext_filterc"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgetcontrols"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="widgetfunction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="linkedaction"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="listfilterparam"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_feature_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="rid" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="formname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="formtype" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="columnname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hidden" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="layoutname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="layoutorder" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="iseditable" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ismandatory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="datatype" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgettype" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgetdim" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tooltip" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placeholder" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isparent" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isautoupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_querytext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_orderby_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_isnullvalue" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dv_querytext_filterc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgetcontrols" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="widgetfunction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="linkedaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="listfilterparam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_feature_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="rid"/>
-        <constraint desc="" exp="" field="formname"/>
-        <constraint desc="" exp="" field="formtype"/>
-        <constraint desc="" exp="" field="columnname"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="hidden"/>
-        <constraint desc="" exp="" field="layoutname"/>
-        <constraint desc="" exp="" field="layoutorder"/>
-        <constraint desc="" exp="" field="iseditable"/>
-        <constraint desc="" exp="" field="ismandatory"/>
-        <constraint desc="" exp="" field="datatype"/>
-        <constraint desc="" exp="" field="widgettype"/>
-        <constraint desc="" exp="" field="widgetdim"/>
-        <constraint desc="" exp="" field="tooltip"/>
-        <constraint desc="" exp="" field="placeholder"/>
-        <constraint desc="" exp="" field="stylesheet"/>
-        <constraint desc="" exp="" field="isparent"/>
-        <constraint desc="" exp="" field="isautoupdate"/>
-        <constraint desc="" exp="" field="dv_querytext"/>
-        <constraint desc="" exp="" field="dv_orderby_id"/>
-        <constraint desc="" exp="" field="dv_isnullvalue"/>
-        <constraint desc="" exp="" field="dv_parent_id"/>
-        <constraint desc="" exp="" field="dv_querytext_filterc"/>
-        <constraint desc="" exp="" field="widgetcontrols"/>
-        <constraint desc="" exp="" field="widgetfunction"/>
-        <constraint desc="" exp="" field="linkedaction"/>
-        <constraint desc="" exp="" field="listfilterparam"/>
-        <constraint desc="" exp="" field="cat_feature_id"/>
+        <constraint exp="" field="rid" desc=""/>
+        <constraint exp="" field="formname" desc=""/>
+        <constraint exp="" field="formtype" desc=""/>
+        <constraint exp="" field="columnname" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="layoutname" desc=""/>
+        <constraint exp="" field="layoutorder" desc=""/>
+        <constraint exp="" field="iseditable" desc=""/>
+        <constraint exp="" field="ismandatory" desc=""/>
+        <constraint exp="" field="datatype" desc=""/>
+        <constraint exp="" field="widgettype" desc=""/>
+        <constraint exp="" field="widgetdim" desc=""/>
+        <constraint exp="" field="tooltip" desc=""/>
+        <constraint exp="" field="placeholder" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
+        <constraint exp="" field="isparent" desc=""/>
+        <constraint exp="" field="isautoupdate" desc=""/>
+        <constraint exp="" field="dv_querytext" desc=""/>
+        <constraint exp="" field="dv_orderby_id" desc=""/>
+        <constraint exp="" field="dv_isnullvalue" desc=""/>
+        <constraint exp="" field="dv_parent_id" desc=""/>
+        <constraint exp="" field="dv_querytext_filterc" desc=""/>
+        <constraint exp="" field="widgetcontrols" desc=""/>
+        <constraint exp="" field="widgetfunction" desc=""/>
+        <constraint exp="" field="linkedaction" desc=""/>
+        <constraint exp="" field="listfilterparam" desc=""/>
+        <constraint exp="" field="cat_feature_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -44755,35 +44316,35 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="rid" width="-1"/>
-          <column type="field" hidden="0" name="formname" width="-1"/>
-          <column type="field" hidden="0" name="formtype" width="-1"/>
-          <column type="field" hidden="0" name="columnname" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="hidden" width="-1"/>
-          <column type="field" hidden="0" name="layoutname" width="-1"/>
-          <column type="field" hidden="0" name="layoutorder" width="-1"/>
-          <column type="field" hidden="0" name="iseditable" width="-1"/>
-          <column type="field" hidden="0" name="ismandatory" width="-1"/>
-          <column type="field" hidden="0" name="datatype" width="-1"/>
-          <column type="field" hidden="0" name="widgettype" width="-1"/>
-          <column type="field" hidden="0" name="widgetdim" width="-1"/>
-          <column type="field" hidden="0" name="tooltip" width="-1"/>
-          <column type="field" hidden="0" name="placeholder" width="-1"/>
-          <column type="field" hidden="0" name="stylesheet" width="-1"/>
-          <column type="field" hidden="0" name="isparent" width="-1"/>
-          <column type="field" hidden="0" name="isautoupdate" width="-1"/>
-          <column type="field" hidden="0" name="dv_querytext" width="-1"/>
-          <column type="field" hidden="0" name="dv_orderby_id" width="-1"/>
-          <column type="field" hidden="0" name="dv_isnullvalue" width="-1"/>
-          <column type="field" hidden="0" name="dv_parent_id" width="-1"/>
-          <column type="field" hidden="0" name="dv_querytext_filterc" width="-1"/>
-          <column type="field" hidden="0" name="widgetcontrols" width="-1"/>
-          <column type="field" hidden="0" name="widgetfunction" width="-1"/>
-          <column type="field" hidden="0" name="linkedaction" width="-1"/>
-          <column type="field" hidden="0" name="listfilterparam" width="-1"/>
-          <column type="field" hidden="0" name="cat_feature_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="rid"/>
+          <column type="field" width="-1" hidden="0" name="formname"/>
+          <column type="field" width="-1" hidden="0" name="formtype"/>
+          <column type="field" width="-1" hidden="0" name="columnname"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="hidden"/>
+          <column type="field" width="-1" hidden="0" name="layoutname"/>
+          <column type="field" width="-1" hidden="0" name="layoutorder"/>
+          <column type="field" width="-1" hidden="0" name="iseditable"/>
+          <column type="field" width="-1" hidden="0" name="ismandatory"/>
+          <column type="field" width="-1" hidden="0" name="datatype"/>
+          <column type="field" width="-1" hidden="0" name="widgettype"/>
+          <column type="field" width="-1" hidden="0" name="widgetdim"/>
+          <column type="field" width="-1" hidden="0" name="tooltip"/>
+          <column type="field" width="-1" hidden="0" name="placeholder"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="field" width="-1" hidden="0" name="isparent"/>
+          <column type="field" width="-1" hidden="0" name="isautoupdate"/>
+          <column type="field" width="-1" hidden="0" name="dv_querytext"/>
+          <column type="field" width="-1" hidden="0" name="dv_orderby_id"/>
+          <column type="field" width="-1" hidden="0" name="dv_isnullvalue"/>
+          <column type="field" width="-1" hidden="0" name="dv_parent_id"/>
+          <column type="field" width="-1" hidden="0" name="dv_querytext_filterc"/>
+          <column type="field" width="-1" hidden="0" name="widgetcontrols"/>
+          <column type="field" width="-1" hidden="0" name="widgetfunction"/>
+          <column type="field" width="-1" hidden="0" name="linkedaction"/>
+          <column type="field" width="-1" hidden="0" name="listfilterparam"/>
+          <column type="field" width="-1" hidden="0" name="cat_feature_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -44804,7 +44365,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"formname"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -44863,7 +44424,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -44887,59 +44448,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -44956,22 +44517,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -45608,374 +45169,374 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="connec_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="connecat_id"/>
-        <alias index="7" name="" field="expl_id"/>
-        <alias index="8" name="" field="macroexpl_id"/>
-        <alias index="9" name="" field="sector_id"/>
-        <alias index="10" name="" field="sector_name"/>
-        <alias index="11" name="" field="macrosector_id"/>
-        <alias index="12" name="" field="customer_code"/>
-        <alias index="13" name="" field="cat_matcat_id"/>
-        <alias index="14" name="" field="cat_pnom"/>
-        <alias index="15" name="" field="cat_dnom"/>
-        <alias index="16" name="" field="connec_length"/>
-        <alias index="17" name="" field="state"/>
-        <alias index="18" name="" field="state_type"/>
-        <alias index="19" name="" field="n_hydrometer"/>
-        <alias index="20" name="" field="arc_id"/>
-        <alias index="21" name="" field="annotation"/>
-        <alias index="22" name="" field="observ"/>
-        <alias index="23" name="" field="comment"/>
-        <alias index="24" name="" field="minsector_id"/>
-        <alias index="25" name="" field="dma_id"/>
-        <alias index="26" name="" field="dma_name"/>
-        <alias index="27" name="" field="macrodma_id"/>
-        <alias index="28" name="" field="presszone_id"/>
-        <alias index="29" name="" field="presszone_name"/>
-        <alias index="30" name="" field="staticpressure"/>
-        <alias index="31" name="" field="dqa_id"/>
-        <alias index="32" name="" field="dqa_name"/>
-        <alias index="33" name="" field="macrodqa_id"/>
-        <alias index="34" name="" field="soilcat_id"/>
-        <alias index="35" name="" field="function_type"/>
-        <alias index="36" name="" field="category_type"/>
-        <alias index="37" name="" field="fluid_type"/>
-        <alias index="38" name="" field="location_type"/>
-        <alias index="39" name="" field="workcat_id"/>
-        <alias index="40" name="" field="workcat_id_end"/>
-        <alias index="41" name="" field="buildercat_id"/>
-        <alias index="42" name="" field="builtdate"/>
-        <alias index="43" name="" field="enddate"/>
-        <alias index="44" name="" field="ownercat_id"/>
-        <alias index="45" name="" field="muni_id"/>
-        <alias index="46" name="" field="postcode"/>
-        <alias index="47" name="" field="district_id"/>
-        <alias index="48" name="" field="streetname"/>
-        <alias index="49" name="" field="postnumber"/>
-        <alias index="50" name="" field="postcomplement"/>
-        <alias index="51" name="" field="streetname2"/>
-        <alias index="52" name="" field="postnumber2"/>
-        <alias index="53" name="" field="postcomplement2"/>
-        <alias index="54" name="" field="descript"/>
-        <alias index="55" name="" field="svg"/>
-        <alias index="56" name="" field="rotation"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="connectype_id"/>
-        <alias index="68" name="" field="feature_id"/>
-        <alias index="69" name="" field="featurecat_id"/>
-        <alias index="70" name="" field="pjoint_id"/>
-        <alias index="71" name="" field="pjoint_type"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="adate"/>
-        <alias index="77" name="" field="adescript"/>
-        <alias index="78" name="" field="accessibility"/>
-        <alias index="79" name="" field="pol_id"/>
-        <alias index="80" name="" field="linked_connec"/>
-        <alias index="81" name="" field="vmax"/>
-        <alias index="82" name="" field="vtotal"/>
-        <alias index="83" name="" field="container_number"/>
-        <alias index="84" name="" field="pump_number"/>
-        <alias index="85" name="" field="power"/>
-        <alias index="86" name="" field="regulation_tank"/>
-        <alias index="87" name="" field="chlorinator"/>
-        <alias index="88" name="" field="arq_patrimony"/>
-        <alias index="89" name="" field="name"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="connec_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="connecat_id" name="" index="6"/>
+        <alias field="expl_id" name="" index="7"/>
+        <alias field="macroexpl_id" name="" index="8"/>
+        <alias field="sector_id" name="" index="9"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
+        <alias field="pol_id" name="" index="79"/>
+        <alias field="linked_connec" name="" index="80"/>
+        <alias field="vmax" name="" index="81"/>
+        <alias field="vtotal" name="" index="82"/>
+        <alias field="container_number" name="" index="83"/>
+        <alias field="pump_number" name="" index="84"/>
+        <alias field="power" name="" index="85"/>
+        <alias field="regulation_tank" name="" index="86"/>
+        <alias field="chlorinator" name="" index="87"/>
+        <alias field="arq_patrimony" name="" index="88"/>
+        <alias field="name" name="" index="89"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connec_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="connec_length" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="n_hydrometer" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="linked_connec" applyOnUpdate="0"/>
-        <default expression="" field="vmax" applyOnUpdate="0"/>
-        <default expression="" field="vtotal" applyOnUpdate="0"/>
-        <default expression="" field="container_number" applyOnUpdate="0"/>
-        <default expression="" field="pump_number" applyOnUpdate="0"/>
-        <default expression="" field="power" applyOnUpdate="0"/>
-        <default expression="" field="regulation_tank" applyOnUpdate="0"/>
-        <default expression="" field="chlorinator" applyOnUpdate="0"/>
-        <default expression="" field="arq_patrimony" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="linked_connec" expression=""/>
+        <default applyOnUpdate="0" field="vmax" expression=""/>
+        <default applyOnUpdate="0" field="vtotal" expression=""/>
+        <default applyOnUpdate="0" field="container_number" expression=""/>
+        <default applyOnUpdate="0" field="pump_number" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="regulation_tank" expression=""/>
+        <default applyOnUpdate="0" field="chlorinator" expression=""/>
+        <default applyOnUpdate="0" field="arq_patrimony" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="n_hydrometer"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="linked_connec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vmax"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vtotal"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="container_number"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pump_number"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="power"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulation_tank"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="chlorinator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arq_patrimony"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="linked_connec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vmax" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vtotal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="container_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pump_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulation_tank" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="chlorinator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arq_patrimony" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connec_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="connec_length"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="n_hydrometer"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="linked_connec"/>
-        <constraint desc="" exp="" field="vmax"/>
-        <constraint desc="" exp="" field="vtotal"/>
-        <constraint desc="" exp="" field="container_number"/>
-        <constraint desc="" exp="" field="pump_number"/>
-        <constraint desc="" exp="" field="power"/>
-        <constraint desc="" exp="" field="regulation_tank"/>
-        <constraint desc="" exp="" field="chlorinator"/>
-        <constraint desc="" exp="" field="arq_patrimony"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="linked_connec" desc=""/>
+        <constraint exp="" field="vmax" desc=""/>
+        <constraint exp="" field="vtotal" desc=""/>
+        <constraint exp="" field="container_number" desc=""/>
+        <constraint exp="" field="pump_number" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="regulation_tank" desc=""/>
+        <constraint exp="" field="chlorinator" desc=""/>
+        <constraint exp="" field="arq_patrimony" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -45983,90 +45544,90 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="connec_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="connecat_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="connec_length" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="n_hydrometer" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_type" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="linked_connec" width="-1"/>
-          <column type="field" hidden="0" name="vmax" width="-1"/>
-          <column type="field" hidden="0" name="vtotal" width="-1"/>
-          <column type="field" hidden="0" name="container_number" width="-1"/>
-          <column type="field" hidden="0" name="pump_number" width="-1"/>
-          <column type="field" hidden="0" name="power" width="-1"/>
-          <column type="field" hidden="0" name="regulation_tank" width="-1"/>
-          <column type="field" hidden="0" name="chlorinator" width="-1"/>
-          <column type="field" hidden="0" name="arq_patrimony" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="linked_connec"/>
+          <column type="field" width="-1" hidden="0" name="vmax"/>
+          <column type="field" width="-1" hidden="0" name="vtotal"/>
+          <column type="field" width="-1" hidden="0" name="container_number"/>
+          <column type="field" width="-1" hidden="0" name="pump_number"/>
+          <column type="field" width="-1" hidden="0" name="power"/>
+          <column type="field" width="-1" hidden="0" name="regulation_tank"/>
+          <column type="field" width="-1" hidden="0" name="chlorinator"/>
+          <column type="field" width="-1" hidden="0" name="arq_patrimony"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -46273,7 +45834,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>connec_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -46332,7 +45893,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -46356,33 +45917,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="178,223,138,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="50,48,55,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="178,223,138,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -46399,22 +45960,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -46995,342 +46556,342 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="connec_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="connecat_id"/>
-        <alias index="7" name="" field="expl_id"/>
-        <alias index="8" name="" field="macroexpl_id"/>
-        <alias index="9" name="" field="sector_id"/>
-        <alias index="10" name="" field="sector_name"/>
-        <alias index="11" name="" field="macrosector_id"/>
-        <alias index="12" name="" field="customer_code"/>
-        <alias index="13" name="" field="cat_matcat_id"/>
-        <alias index="14" name="" field="cat_pnom"/>
-        <alias index="15" name="" field="cat_dnom"/>
-        <alias index="16" name="" field="connec_length"/>
-        <alias index="17" name="" field="state"/>
-        <alias index="18" name="" field="state_type"/>
-        <alias index="19" name="" field="n_hydrometer"/>
-        <alias index="20" name="" field="arc_id"/>
-        <alias index="21" name="" field="annotation"/>
-        <alias index="22" name="" field="observ"/>
-        <alias index="23" name="" field="comment"/>
-        <alias index="24" name="" field="minsector_id"/>
-        <alias index="25" name="" field="dma_id"/>
-        <alias index="26" name="" field="dma_name"/>
-        <alias index="27" name="" field="macrodma_id"/>
-        <alias index="28" name="" field="presszone_id"/>
-        <alias index="29" name="" field="presszone_name"/>
-        <alias index="30" name="" field="staticpressure"/>
-        <alias index="31" name="" field="dqa_id"/>
-        <alias index="32" name="" field="dqa_name"/>
-        <alias index="33" name="" field="macrodqa_id"/>
-        <alias index="34" name="" field="soilcat_id"/>
-        <alias index="35" name="" field="function_type"/>
-        <alias index="36" name="" field="category_type"/>
-        <alias index="37" name="" field="fluid_type"/>
-        <alias index="38" name="" field="location_type"/>
-        <alias index="39" name="" field="workcat_id"/>
-        <alias index="40" name="" field="workcat_id_end"/>
-        <alias index="41" name="" field="buildercat_id"/>
-        <alias index="42" name="" field="builtdate"/>
-        <alias index="43" name="" field="enddate"/>
-        <alias index="44" name="" field="ownercat_id"/>
-        <alias index="45" name="" field="muni_id"/>
-        <alias index="46" name="" field="postcode"/>
-        <alias index="47" name="" field="district_id"/>
-        <alias index="48" name="" field="streetname"/>
-        <alias index="49" name="" field="postnumber"/>
-        <alias index="50" name="" field="postcomplement"/>
-        <alias index="51" name="" field="streetname2"/>
-        <alias index="52" name="" field="postnumber2"/>
-        <alias index="53" name="" field="postcomplement2"/>
-        <alias index="54" name="" field="descript"/>
-        <alias index="55" name="" field="svg"/>
-        <alias index="56" name="" field="rotation"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="connectype_id"/>
-        <alias index="68" name="" field="feature_id"/>
-        <alias index="69" name="" field="featurecat_id"/>
-        <alias index="70" name="" field="pjoint_id"/>
-        <alias index="71" name="" field="pjoint_type"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="adate"/>
-        <alias index="77" name="" field="adescript"/>
-        <alias index="78" name="" field="accessibility"/>
-        <alias index="79" name="" field="linked_connec"/>
-        <alias index="80" name="" field="brand"/>
-        <alias index="81" name="" field="model"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="connec_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="connecat_id" name="" index="6"/>
+        <alias field="expl_id" name="" index="7"/>
+        <alias field="macroexpl_id" name="" index="8"/>
+        <alias field="sector_id" name="" index="9"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
+        <alias field="linked_connec" name="" index="79"/>
+        <alias field="brand" name="" index="80"/>
+        <alias field="model" name="" index="81"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connec_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="connec_length" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="n_hydrometer" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="linked_connec" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="linked_connec" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="n_hydrometer"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="linked_connec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="linked_connec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connec_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="connec_length"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="n_hydrometer"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="linked_connec"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="linked_connec" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -47338,80 +46899,80 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="connec_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="connecat_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="connec_length" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="n_hydrometer" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_type" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="linked_connec" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="linked_connec"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -47598,7 +47159,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>connec_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -47657,7 +47218,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -47681,33 +47242,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="50,48,55,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -47724,22 +47285,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -48355,362 +47916,362 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="connec_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="connecat_id"/>
-        <alias index="7" name="" field="expl_id"/>
-        <alias index="8" name="" field="macroexpl_id"/>
-        <alias index="9" name="" field="sector_id"/>
-        <alias index="10" name="" field="sector_name"/>
-        <alias index="11" name="" field="macrosector_id"/>
-        <alias index="12" name="" field="customer_code"/>
-        <alias index="13" name="" field="cat_matcat_id"/>
-        <alias index="14" name="" field="cat_pnom"/>
-        <alias index="15" name="" field="cat_dnom"/>
-        <alias index="16" name="" field="connec_length"/>
-        <alias index="17" name="" field="state"/>
-        <alias index="18" name="" field="state_type"/>
-        <alias index="19" name="" field="n_hydrometer"/>
-        <alias index="20" name="" field="arc_id"/>
-        <alias index="21" name="" field="annotation"/>
-        <alias index="22" name="" field="observ"/>
-        <alias index="23" name="" field="comment"/>
-        <alias index="24" name="" field="minsector_id"/>
-        <alias index="25" name="" field="dma_id"/>
-        <alias index="26" name="" field="dma_name"/>
-        <alias index="27" name="" field="macrodma_id"/>
-        <alias index="28" name="" field="presszone_id"/>
-        <alias index="29" name="" field="presszone_name"/>
-        <alias index="30" name="" field="staticpressure"/>
-        <alias index="31" name="" field="dqa_id"/>
-        <alias index="32" name="" field="dqa_name"/>
-        <alias index="33" name="" field="macrodqa_id"/>
-        <alias index="34" name="" field="soilcat_id"/>
-        <alias index="35" name="" field="function_type"/>
-        <alias index="36" name="" field="category_type"/>
-        <alias index="37" name="" field="fluid_type"/>
-        <alias index="38" name="" field="location_type"/>
-        <alias index="39" name="" field="workcat_id"/>
-        <alias index="40" name="" field="workcat_id_end"/>
-        <alias index="41" name="" field="buildercat_id"/>
-        <alias index="42" name="" field="builtdate"/>
-        <alias index="43" name="" field="enddate"/>
-        <alias index="44" name="" field="ownercat_id"/>
-        <alias index="45" name="" field="muni_id"/>
-        <alias index="46" name="" field="postcode"/>
-        <alias index="47" name="" field="district_id"/>
-        <alias index="48" name="" field="streetname"/>
-        <alias index="49" name="" field="postnumber"/>
-        <alias index="50" name="" field="postcomplement"/>
-        <alias index="51" name="" field="streetname2"/>
-        <alias index="52" name="" field="postnumber2"/>
-        <alias index="53" name="" field="postcomplement2"/>
-        <alias index="54" name="" field="descript"/>
-        <alias index="55" name="" field="svg"/>
-        <alias index="56" name="" field="rotation"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="connectype_id"/>
-        <alias index="68" name="" field="feature_id"/>
-        <alias index="69" name="" field="featurecat_id"/>
-        <alias index="70" name="" field="pjoint_id"/>
-        <alias index="71" name="" field="pjoint_type"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="adate"/>
-        <alias index="77" name="" field="adescript"/>
-        <alias index="78" name="" field="accessibility"/>
-        <alias index="79" name="" field="linked_connec"/>
-        <alias index="80" name="" field="cat_valve"/>
-        <alias index="81" name="" field="drain_diam"/>
-        <alias index="82" name="" field="drain_exit"/>
-        <alias index="83" name="" field="drain_gully"/>
-        <alias index="84" name="" field="drain_distance"/>
-        <alias index="85" name="" field="arq_patrimony"/>
-        <alias index="86" name="" field="com_state"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="connec_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="connecat_id" name="" index="6"/>
+        <alias field="expl_id" name="" index="7"/>
+        <alias field="macroexpl_id" name="" index="8"/>
+        <alias field="sector_id" name="" index="9"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
+        <alias field="linked_connec" name="" index="79"/>
+        <alias field="cat_valve" name="" index="80"/>
+        <alias field="drain_diam" name="" index="81"/>
+        <alias field="drain_exit" name="" index="82"/>
+        <alias field="drain_gully" name="" index="83"/>
+        <alias field="drain_distance" name="" index="84"/>
+        <alias field="arq_patrimony" name="" index="85"/>
+        <alias field="com_state" name="" index="86"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connec_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="connec_length" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="n_hydrometer" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="linked_connec" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve" applyOnUpdate="0"/>
-        <default expression="" field="drain_diam" applyOnUpdate="0"/>
-        <default expression="" field="drain_exit" applyOnUpdate="0"/>
-        <default expression="" field="drain_gully" applyOnUpdate="0"/>
-        <default expression="" field="drain_distance" applyOnUpdate="0"/>
-        <default expression="" field="arq_patrimony" applyOnUpdate="0"/>
-        <default expression="" field="com_state" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="linked_connec" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve" expression=""/>
+        <default applyOnUpdate="0" field="drain_diam" expression=""/>
+        <default applyOnUpdate="0" field="drain_exit" expression=""/>
+        <default applyOnUpdate="0" field="drain_gully" expression=""/>
+        <default applyOnUpdate="0" field="drain_distance" expression=""/>
+        <default applyOnUpdate="0" field="arq_patrimony" expression=""/>
+        <default applyOnUpdate="0" field="com_state" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="n_hydrometer"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="linked_connec"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drain_diam"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drain_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drain_gully"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drain_distance"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arq_patrimony"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="com_state"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="linked_connec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drain_diam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drain_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drain_gully" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drain_distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arq_patrimony" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="com_state" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connec_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="connec_length"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="n_hydrometer"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="linked_connec"/>
-        <constraint desc="" exp="" field="cat_valve"/>
-        <constraint desc="" exp="" field="drain_diam"/>
-        <constraint desc="" exp="" field="drain_exit"/>
-        <constraint desc="" exp="" field="drain_gully"/>
-        <constraint desc="" exp="" field="drain_distance"/>
-        <constraint desc="" exp="" field="arq_patrimony"/>
-        <constraint desc="" exp="" field="com_state"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="linked_connec" desc=""/>
+        <constraint exp="" field="cat_valve" desc=""/>
+        <constraint exp="" field="drain_diam" desc=""/>
+        <constraint exp="" field="drain_exit" desc=""/>
+        <constraint exp="" field="drain_gully" desc=""/>
+        <constraint exp="" field="drain_distance" desc=""/>
+        <constraint exp="" field="arq_patrimony" desc=""/>
+        <constraint exp="" field="com_state" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -48718,87 +48279,87 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="connec_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="connecat_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="connec_length" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="n_hydrometer" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_type" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="linked_connec" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve" width="-1"/>
-          <column type="field" hidden="0" name="drain_diam" width="-1"/>
-          <column type="field" hidden="0" name="drain_exit" width="-1"/>
-          <column type="field" hidden="0" name="drain_gully" width="-1"/>
-          <column type="field" hidden="0" name="drain_distance" width="-1"/>
-          <column type="field" hidden="0" name="arq_patrimony" width="-1"/>
-          <column type="field" hidden="0" name="com_state" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="linked_connec"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve"/>
+          <column type="field" width="-1" hidden="0" name="drain_diam"/>
+          <column type="field" width="-1" hidden="0" name="drain_exit"/>
+          <column type="field" width="-1" hidden="0" name="drain_gully"/>
+          <column type="field" width="-1" hidden="0" name="drain_distance"/>
+          <column type="field" width="-1" hidden="0" name="arq_patrimony"/>
+          <column type="field" width="-1" hidden="0" name="com_state"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -48999,7 +48560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>connec_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -49058,7 +48619,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -49082,60 +48643,60 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -49152,22 +48713,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -49755,346 +49316,346 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="connec_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="connec_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="connecat_id"/>
-        <alias index="7" name="" field="expl_id"/>
-        <alias index="8" name="" field="macroexpl_id"/>
-        <alias index="9" name="" field="sector_id"/>
-        <alias index="10" name="" field="sector_name"/>
-        <alias index="11" name="" field="macrosector_id"/>
-        <alias index="12" name="" field="customer_code"/>
-        <alias index="13" name="" field="cat_matcat_id"/>
-        <alias index="14" name="" field="cat_pnom"/>
-        <alias index="15" name="" field="cat_dnom"/>
-        <alias index="16" name="" field="connec_length"/>
-        <alias index="17" name="" field="state"/>
-        <alias index="18" name="" field="state_type"/>
-        <alias index="19" name="" field="n_hydrometer"/>
-        <alias index="20" name="" field="arc_id"/>
-        <alias index="21" name="" field="annotation"/>
-        <alias index="22" name="" field="observ"/>
-        <alias index="23" name="" field="comment"/>
-        <alias index="24" name="" field="minsector_id"/>
-        <alias index="25" name="" field="dma_id"/>
-        <alias index="26" name="" field="dma_name"/>
-        <alias index="27" name="" field="macrodma_id"/>
-        <alias index="28" name="" field="presszone_id"/>
-        <alias index="29" name="" field="presszone_name"/>
-        <alias index="30" name="" field="staticpressure"/>
-        <alias index="31" name="" field="dqa_id"/>
-        <alias index="32" name="" field="dqa_name"/>
-        <alias index="33" name="" field="macrodqa_id"/>
-        <alias index="34" name="" field="soilcat_id"/>
-        <alias index="35" name="" field="function_type"/>
-        <alias index="36" name="" field="category_type"/>
-        <alias index="37" name="" field="fluid_type"/>
-        <alias index="38" name="" field="location_type"/>
-        <alias index="39" name="" field="workcat_id"/>
-        <alias index="40" name="" field="workcat_id_end"/>
-        <alias index="41" name="" field="buildercat_id"/>
-        <alias index="42" name="" field="builtdate"/>
-        <alias index="43" name="" field="enddate"/>
-        <alias index="44" name="" field="ownercat_id"/>
-        <alias index="45" name="" field="muni_id"/>
-        <alias index="46" name="" field="postcode"/>
-        <alias index="47" name="" field="district_id"/>
-        <alias index="48" name="" field="streetname"/>
-        <alias index="49" name="" field="postnumber"/>
-        <alias index="50" name="" field="postcomplement"/>
-        <alias index="51" name="" field="streetname2"/>
-        <alias index="52" name="" field="postnumber2"/>
-        <alias index="53" name="" field="postcomplement2"/>
-        <alias index="54" name="" field="descript"/>
-        <alias index="55" name="" field="svg"/>
-        <alias index="56" name="" field="rotation"/>
-        <alias index="57" name="" field="link"/>
-        <alias index="58" name="" field="verified"/>
-        <alias index="59" name="" field="undelete"/>
-        <alias index="60" name="" field="label"/>
-        <alias index="61" name="" field="label_x"/>
-        <alias index="62" name="" field="label_y"/>
-        <alias index="63" name="" field="label_rotation"/>
-        <alias index="64" name="" field="publish"/>
-        <alias index="65" name="" field="inventory"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="connectype_id"/>
-        <alias index="68" name="" field="feature_id"/>
-        <alias index="69" name="" field="featurecat_id"/>
-        <alias index="70" name="" field="pjoint_id"/>
-        <alias index="71" name="" field="pjoint_type"/>
-        <alias index="72" name="" field="tstamp"/>
-        <alias index="73" name="" field="insert_user"/>
-        <alias index="74" name="" field="lastupdate"/>
-        <alias index="75" name="" field="lastupdate_user"/>
-        <alias index="76" name="" field="adate"/>
-        <alias index="77" name="" field="adescript"/>
-        <alias index="78" name="" field="accessibility"/>
-        <alias index="79" name="" field="top_floor"/>
-        <alias index="80" name="" field="cat_valve"/>
-        <alias index="81" name="" field="brand"/>
-        <alias index="82" name="" field="model"/>
+        <alias field="connec_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="connec_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="connecat_id" name="" index="6"/>
+        <alias field="expl_id" name="" index="7"/>
+        <alias field="macroexpl_id" name="" index="8"/>
+        <alias field="sector_id" name="" index="9"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
+        <alias field="top_floor" name="" index="79"/>
+        <alias field="cat_valve" name="" index="80"/>
+        <alias field="brand" name="" index="81"/>
+        <alias field="model" name="" index="82"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="connec_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="connecat_id" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="connec_length" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="n_hydrometer" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="connectype_id" applyOnUpdate="0"/>
-        <default expression="" field="feature_id" applyOnUpdate="0"/>
-        <default expression="" field="featurecat_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_id" applyOnUpdate="0"/>
-        <default expression="" field="pjoint_type" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="top_floor" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="top_floor" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="connec_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_length"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="n_hydrometer"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connectype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="feature_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="featurecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pjoint_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="top_floor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="top_floor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="connec_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="connec_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="connecat_id"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="connec_length"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="n_hydrometer"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="connectype_id"/>
-        <constraint desc="" exp="" field="feature_id"/>
-        <constraint desc="" exp="" field="featurecat_id"/>
-        <constraint desc="" exp="" field="pjoint_id"/>
-        <constraint desc="" exp="" field="pjoint_type"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="top_floor"/>
-        <constraint desc="" exp="" field="cat_valve"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="top_floor" desc=""/>
+        <constraint exp="" field="cat_valve" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -50102,81 +49663,81 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="connec_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="connecat_id" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="connec_length" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="n_hydrometer" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="connectype_id" width="-1"/>
-          <column type="field" hidden="0" name="feature_id" width="-1"/>
-          <column type="field" hidden="0" name="featurecat_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_id" width="-1"/>
-          <column type="field" hidden="0" name="pjoint_type" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="top_floor" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="top_floor"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -50365,7 +49926,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>connec_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -50424,7 +49985,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -50448,59 +50009,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -50517,22 +50078,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -51239,414 +50800,414 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="closed"/>
-        <alias index="78" name="" field="broken"/>
-        <alias index="79" name="" field="buried"/>
-        <alias index="80" name="" field="irrigation_indicator"/>
-        <alias index="81" name="" field="pression_entry"/>
-        <alias index="82" name="" field="pression_exit"/>
-        <alias index="83" name="" field="depth_valveshaft"/>
-        <alias index="84" name="" field="regulator_situation"/>
-        <alias index="85" name="" field="regulator_location"/>
-        <alias index="86" name="" field="regulator_observ"/>
-        <alias index="87" name="" field="lin_meters"/>
-        <alias index="88" name="" field="exit_type"/>
-        <alias index="89" name="" field="exit_code"/>
-        <alias index="90" name="" field="drive_type"/>
-        <alias index="91" name="" field="cat_valve2"/>
-        <alias index="92" name="" field="ordinarystatus"/>
-        <alias index="93" name="" field="shutter"/>
-        <alias index="94" name="" field="brand"/>
-        <alias index="95" name="" field="brand2"/>
-        <alias index="96" name="" field="model"/>
-        <alias index="97" name="" field="model2"/>
-        <alias index="98" name="" field="airvalve_param_1"/>
-        <alias index="99" name="" field="airvalve_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="closed" name="" index="77"/>
+        <alias field="broken" name="" index="78"/>
+        <alias field="buried" name="" index="79"/>
+        <alias field="irrigation_indicator" name="" index="80"/>
+        <alias field="pression_entry" name="" index="81"/>
+        <alias field="pression_exit" name="" index="82"/>
+        <alias field="depth_valveshaft" name="" index="83"/>
+        <alias field="regulator_situation" name="" index="84"/>
+        <alias field="regulator_location" name="" index="85"/>
+        <alias field="regulator_observ" name="" index="86"/>
+        <alias field="lin_meters" name="" index="87"/>
+        <alias field="exit_type" name="" index="88"/>
+        <alias field="exit_code" name="" index="89"/>
+        <alias field="drive_type" name="" index="90"/>
+        <alias field="cat_valve2" name="" index="91"/>
+        <alias field="ordinarystatus" name="" index="92"/>
+        <alias field="shutter" name="" index="93"/>
+        <alias field="brand" name="" index="94"/>
+        <alias field="brand2" name="" index="95"/>
+        <alias field="model" name="" index="96"/>
+        <alias field="model2" name="" index="97"/>
+        <alias field="airvalve_param_1" name="" index="98"/>
+        <alias field="airvalve_param_2" name="" index="99"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="buried" applyOnUpdate="0"/>
-        <default expression="" field="irrigation_indicator" applyOnUpdate="0"/>
-        <default expression="" field="pression_entry" applyOnUpdate="0"/>
-        <default expression="" field="pression_exit" applyOnUpdate="0"/>
-        <default expression="" field="depth_valveshaft" applyOnUpdate="0"/>
-        <default expression="" field="regulator_situation" applyOnUpdate="0"/>
-        <default expression="" field="regulator_location" applyOnUpdate="0"/>
-        <default expression="" field="regulator_observ" applyOnUpdate="0"/>
-        <default expression="" field="lin_meters" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_code" applyOnUpdate="0"/>
-        <default expression="" field="drive_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve2" applyOnUpdate="0"/>
-        <default expression="" field="ordinarystatus" applyOnUpdate="0"/>
-        <default expression="" field="shutter" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="brand2" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="model2" applyOnUpdate="0"/>
-        <default expression="" field="airvalve_param_1" applyOnUpdate="0"/>
-        <default expression="" field="airvalve_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="buried" expression=""/>
+        <default applyOnUpdate="0" field="irrigation_indicator" expression=""/>
+        <default applyOnUpdate="0" field="pression_entry" expression=""/>
+        <default applyOnUpdate="0" field="pression_exit" expression=""/>
+        <default applyOnUpdate="0" field="depth_valveshaft" expression=""/>
+        <default applyOnUpdate="0" field="regulator_situation" expression=""/>
+        <default applyOnUpdate="0" field="regulator_location" expression=""/>
+        <default applyOnUpdate="0" field="regulator_observ" expression=""/>
+        <default applyOnUpdate="0" field="lin_meters" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_code" expression=""/>
+        <default applyOnUpdate="0" field="drive_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve2" expression=""/>
+        <default applyOnUpdate="0" field="ordinarystatus" expression=""/>
+        <default applyOnUpdate="0" field="shutter" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="brand2" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="model2" expression=""/>
+        <default applyOnUpdate="0" field="airvalve_param_1" expression=""/>
+        <default applyOnUpdate="0" field="airvalve_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buried"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="irrigation_indicator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_entry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth_valveshaft"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_situation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_location"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lin_meters"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drive_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ordinarystatus"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shutter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="airvalve_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="airvalve_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buried" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="irrigation_indicator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_entry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth_valveshaft" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_situation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_location" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lin_meters" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drive_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ordinarystatus" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shutter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="airvalve_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="airvalve_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="buried"/>
-        <constraint desc="" exp="" field="irrigation_indicator"/>
-        <constraint desc="" exp="" field="pression_entry"/>
-        <constraint desc="" exp="" field="pression_exit"/>
-        <constraint desc="" exp="" field="depth_valveshaft"/>
-        <constraint desc="" exp="" field="regulator_situation"/>
-        <constraint desc="" exp="" field="regulator_location"/>
-        <constraint desc="" exp="" field="regulator_observ"/>
-        <constraint desc="" exp="" field="lin_meters"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_code"/>
-        <constraint desc="" exp="" field="drive_type"/>
-        <constraint desc="" exp="" field="cat_valve2"/>
-        <constraint desc="" exp="" field="ordinarystatus"/>
-        <constraint desc="" exp="" field="shutter"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="brand2"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="model2"/>
-        <constraint desc="" exp="" field="airvalve_param_1"/>
-        <constraint desc="" exp="" field="airvalve_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="buried" desc=""/>
+        <constraint exp="" field="irrigation_indicator" desc=""/>
+        <constraint exp="" field="pression_entry" desc=""/>
+        <constraint exp="" field="pression_exit" desc=""/>
+        <constraint exp="" field="depth_valveshaft" desc=""/>
+        <constraint exp="" field="regulator_situation" desc=""/>
+        <constraint exp="" field="regulator_location" desc=""/>
+        <constraint exp="" field="regulator_observ" desc=""/>
+        <constraint exp="" field="lin_meters" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_code" desc=""/>
+        <constraint exp="" field="drive_type" desc=""/>
+        <constraint exp="" field="cat_valve2" desc=""/>
+        <constraint exp="" field="ordinarystatus" desc=""/>
+        <constraint exp="" field="shutter" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="brand2" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="model2" desc=""/>
+        <constraint exp="" field="airvalve_param_1" desc=""/>
+        <constraint exp="" field="airvalve_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -51654,93 +51215,93 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="buried" width="-1"/>
-          <column type="field" hidden="0" name="irrigation_indicator" width="-1"/>
-          <column type="field" hidden="0" name="pression_entry" width="-1"/>
-          <column type="field" hidden="0" name="pression_exit" width="-1"/>
-          <column type="field" hidden="0" name="depth_valveshaft" width="-1"/>
-          <column type="field" hidden="0" name="regulator_situation" width="-1"/>
-          <column type="field" hidden="0" name="regulator_location" width="-1"/>
-          <column type="field" hidden="0" name="regulator_observ" width="-1"/>
-          <column type="field" hidden="0" name="lin_meters" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_code" width="-1"/>
-          <column type="field" hidden="0" name="drive_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve2" width="-1"/>
-          <column type="field" hidden="0" name="airvalve_param_1" width="-1"/>
-          <column type="field" hidden="0" name="airvalve_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="ordinarystatus" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="buried"/>
+          <column type="field" width="-1" hidden="0" name="irrigation_indicator"/>
+          <column type="field" width="-1" hidden="0" name="pression_entry"/>
+          <column type="field" width="-1" hidden="0" name="pression_exit"/>
+          <column type="field" width="-1" hidden="0" name="depth_valveshaft"/>
+          <column type="field" width="-1" hidden="0" name="regulator_situation"/>
+          <column type="field" width="-1" hidden="0" name="regulator_location"/>
+          <column type="field" width="-1" hidden="0" name="regulator_observ"/>
+          <column type="field" width="-1" hidden="0" name="lin_meters"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_code"/>
+          <column type="field" width="-1" hidden="0" name="drive_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve2"/>
+          <column type="field" width="-1" hidden="0" name="airvalve_param_1"/>
+          <column type="field" width="-1" hidden="0" name="airvalve_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="ordinarystatus"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -51953,7 +51514,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -52012,7 +51573,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -52036,59 +51597,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="242,242,242,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="255,1,1,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.4"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="242,242,242,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,1,1,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.4" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -52105,22 +51666,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -52827,414 +52388,414 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="closed"/>
-        <alias index="78" name="" field="broken"/>
-        <alias index="79" name="" field="buried"/>
-        <alias index="80" name="" field="irrigation_indicator"/>
-        <alias index="81" name="" field="pression_entry"/>
-        <alias index="82" name="" field="pression_exit"/>
-        <alias index="83" name="" field="depth_valveshaft"/>
-        <alias index="84" name="" field="regulator_situation"/>
-        <alias index="85" name="" field="regulator_location"/>
-        <alias index="86" name="" field="regulator_observ"/>
-        <alias index="87" name="" field="lin_meters"/>
-        <alias index="88" name="" field="exit_type"/>
-        <alias index="89" name="" field="exit_code"/>
-        <alias index="90" name="" field="drive_type"/>
-        <alias index="91" name="" field="cat_valve2"/>
-        <alias index="92" name="" field="ordinarystatus"/>
-        <alias index="93" name="" field="shutter"/>
-        <alias index="94" name="" field="brand"/>
-        <alias index="95" name="" field="brand2"/>
-        <alias index="96" name="" field="model"/>
-        <alias index="97" name="" field="model2"/>
-        <alias index="98" name="" field="checkvalve_param_1"/>
-        <alias index="99" name="" field="checkvalve_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="closed" name="" index="77"/>
+        <alias field="broken" name="" index="78"/>
+        <alias field="buried" name="" index="79"/>
+        <alias field="irrigation_indicator" name="" index="80"/>
+        <alias field="pression_entry" name="" index="81"/>
+        <alias field="pression_exit" name="" index="82"/>
+        <alias field="depth_valveshaft" name="" index="83"/>
+        <alias field="regulator_situation" name="" index="84"/>
+        <alias field="regulator_location" name="" index="85"/>
+        <alias field="regulator_observ" name="" index="86"/>
+        <alias field="lin_meters" name="" index="87"/>
+        <alias field="exit_type" name="" index="88"/>
+        <alias field="exit_code" name="" index="89"/>
+        <alias field="drive_type" name="" index="90"/>
+        <alias field="cat_valve2" name="" index="91"/>
+        <alias field="ordinarystatus" name="" index="92"/>
+        <alias field="shutter" name="" index="93"/>
+        <alias field="brand" name="" index="94"/>
+        <alias field="brand2" name="" index="95"/>
+        <alias field="model" name="" index="96"/>
+        <alias field="model2" name="" index="97"/>
+        <alias field="checkvalve_param_1" name="" index="98"/>
+        <alias field="checkvalve_param_2" name="" index="99"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="buried" applyOnUpdate="0"/>
-        <default expression="" field="irrigation_indicator" applyOnUpdate="0"/>
-        <default expression="" field="pression_entry" applyOnUpdate="0"/>
-        <default expression="" field="pression_exit" applyOnUpdate="0"/>
-        <default expression="" field="depth_valveshaft" applyOnUpdate="0"/>
-        <default expression="" field="regulator_situation" applyOnUpdate="0"/>
-        <default expression="" field="regulator_location" applyOnUpdate="0"/>
-        <default expression="" field="regulator_observ" applyOnUpdate="0"/>
-        <default expression="" field="lin_meters" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_code" applyOnUpdate="0"/>
-        <default expression="" field="drive_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve2" applyOnUpdate="0"/>
-        <default expression="" field="ordinarystatus" applyOnUpdate="0"/>
-        <default expression="" field="shutter" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="brand2" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="model2" applyOnUpdate="0"/>
-        <default expression="" field="checkvalve_param_1" applyOnUpdate="0"/>
-        <default expression="" field="checkvalve_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="buried" expression=""/>
+        <default applyOnUpdate="0" field="irrigation_indicator" expression=""/>
+        <default applyOnUpdate="0" field="pression_entry" expression=""/>
+        <default applyOnUpdate="0" field="pression_exit" expression=""/>
+        <default applyOnUpdate="0" field="depth_valveshaft" expression=""/>
+        <default applyOnUpdate="0" field="regulator_situation" expression=""/>
+        <default applyOnUpdate="0" field="regulator_location" expression=""/>
+        <default applyOnUpdate="0" field="regulator_observ" expression=""/>
+        <default applyOnUpdate="0" field="lin_meters" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_code" expression=""/>
+        <default applyOnUpdate="0" field="drive_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve2" expression=""/>
+        <default applyOnUpdate="0" field="ordinarystatus" expression=""/>
+        <default applyOnUpdate="0" field="shutter" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="brand2" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="model2" expression=""/>
+        <default applyOnUpdate="0" field="checkvalve_param_1" expression=""/>
+        <default applyOnUpdate="0" field="checkvalve_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buried"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="irrigation_indicator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_entry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth_valveshaft"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_situation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_location"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lin_meters"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drive_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ordinarystatus"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shutter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="checkvalve_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="checkvalve_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buried" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="irrigation_indicator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_entry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth_valveshaft" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_situation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_location" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lin_meters" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drive_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ordinarystatus" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shutter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="checkvalve_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="checkvalve_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="buried"/>
-        <constraint desc="" exp="" field="irrigation_indicator"/>
-        <constraint desc="" exp="" field="pression_entry"/>
-        <constraint desc="" exp="" field="pression_exit"/>
-        <constraint desc="" exp="" field="depth_valveshaft"/>
-        <constraint desc="" exp="" field="regulator_situation"/>
-        <constraint desc="" exp="" field="regulator_location"/>
-        <constraint desc="" exp="" field="regulator_observ"/>
-        <constraint desc="" exp="" field="lin_meters"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_code"/>
-        <constraint desc="" exp="" field="drive_type"/>
-        <constraint desc="" exp="" field="cat_valve2"/>
-        <constraint desc="" exp="" field="ordinarystatus"/>
-        <constraint desc="" exp="" field="shutter"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="brand2"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="model2"/>
-        <constraint desc="" exp="" field="checkvalve_param_1"/>
-        <constraint desc="" exp="" field="checkvalve_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="buried" desc=""/>
+        <constraint exp="" field="irrigation_indicator" desc=""/>
+        <constraint exp="" field="pression_entry" desc=""/>
+        <constraint exp="" field="pression_exit" desc=""/>
+        <constraint exp="" field="depth_valveshaft" desc=""/>
+        <constraint exp="" field="regulator_situation" desc=""/>
+        <constraint exp="" field="regulator_location" desc=""/>
+        <constraint exp="" field="regulator_observ" desc=""/>
+        <constraint exp="" field="lin_meters" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_code" desc=""/>
+        <constraint exp="" field="drive_type" desc=""/>
+        <constraint exp="" field="cat_valve2" desc=""/>
+        <constraint exp="" field="ordinarystatus" desc=""/>
+        <constraint exp="" field="shutter" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="brand2" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="model2" desc=""/>
+        <constraint exp="" field="checkvalve_param_1" desc=""/>
+        <constraint exp="" field="checkvalve_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -53242,93 +52803,93 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="buried" width="-1"/>
-          <column type="field" hidden="0" name="irrigation_indicator" width="-1"/>
-          <column type="field" hidden="0" name="pression_entry" width="-1"/>
-          <column type="field" hidden="0" name="pression_exit" width="-1"/>
-          <column type="field" hidden="0" name="depth_valveshaft" width="-1"/>
-          <column type="field" hidden="0" name="regulator_situation" width="-1"/>
-          <column type="field" hidden="0" name="regulator_location" width="-1"/>
-          <column type="field" hidden="0" name="regulator_observ" width="-1"/>
-          <column type="field" hidden="0" name="lin_meters" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_code" width="-1"/>
-          <column type="field" hidden="0" name="drive_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve2" width="-1"/>
-          <column type="field" hidden="0" name="checkvalve_param_1" width="-1"/>
-          <column type="field" hidden="0" name="checkvalve_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="ordinarystatus" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="buried"/>
+          <column type="field" width="-1" hidden="0" name="irrigation_indicator"/>
+          <column type="field" width="-1" hidden="0" name="pression_entry"/>
+          <column type="field" width="-1" hidden="0" name="pression_exit"/>
+          <column type="field" width="-1" hidden="0" name="depth_valveshaft"/>
+          <column type="field" width="-1" hidden="0" name="regulator_situation"/>
+          <column type="field" width="-1" hidden="0" name="regulator_location"/>
+          <column type="field" width="-1" hidden="0" name="regulator_observ"/>
+          <column type="field" width="-1" hidden="0" name="lin_meters"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_code"/>
+          <column type="field" width="-1" hidden="0" name="drive_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve2"/>
+          <column type="field" width="-1" hidden="0" name="checkvalve_param_1"/>
+          <column type="field" width="-1" hidden="0" name="checkvalve_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="ordinarystatus"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -53541,7 +53102,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <id>ve_node_curve_4e7e8743_9c81_476c_a056_6dc61dae01c3</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_node_curve" (the_geom) sql=</datasource>
       <keywordList>
@@ -53594,7 +53155,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -53618,33 +53179,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="114,155,111,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="114,155,111,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -53661,22 +53222,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -54222,322 +53783,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -54545,74 +54106,74 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -54785,7 +54346,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -54844,7 +54405,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -54868,39 +54429,39 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="243,166,178,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="line"/>
-              <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.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="243,166,178,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="line" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.6" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -54917,22 +54478,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -55478,322 +55039,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -55801,74 +55362,74 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -56041,7 +55602,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -56100,7 +55661,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -56124,59 +55685,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -56193,22 +55754,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -56754,322 +56315,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -57077,75 +56638,75 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -57322,7 +56883,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -57381,7 +56942,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -57405,59 +56966,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -57474,22 +57035,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -58049,330 +57610,330 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="filter_param_1"/>
-        <alias index="78" name="" field="filter_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="filter_param_1" name="" index="77"/>
+        <alias field="filter_param_2" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="filter_param_1" applyOnUpdate="0"/>
-        <default expression="" field="filter_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="filter_param_1" expression=""/>
+        <default applyOnUpdate="0" field="filter_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="filter_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="filter_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="filter_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="filter_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="filter_param_1"/>
-        <constraint desc="" exp="" field="filter_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="filter_param_1" desc=""/>
+        <constraint exp="" field="filter_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -58380,77 +57941,77 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="filter_param_1" width="-1"/>
-          <column type="field" hidden="0" name="filter_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="filter_param_1"/>
+          <column type="field" width="-1" hidden="0" name="filter_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -58631,7 +58192,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -58690,7 +58251,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -58714,59 +58275,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,0.00000000000000006"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0.00000000000000006" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -58783,22 +58344,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -59344,322 +58905,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -59667,75 +59228,75 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -59912,7 +59473,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -59971,7 +59532,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -59995,59 +59556,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -60064,22 +59625,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -60639,330 +60200,330 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="brand"/>
-        <alias index="78" name="" field="model"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="brand" name="" index="77"/>
+        <alias field="model" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -60970,75 +60531,75 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -61215,7 +60776,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -61274,7 +60835,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -61298,71 +60859,71 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="122,122,122,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="122,122,122,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -61379,22 +60940,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -62101,414 +61662,414 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="closed"/>
-        <alias index="78" name="" field="broken"/>
-        <alias index="79" name="" field="buried"/>
-        <alias index="80" name="" field="irrigation_indicator"/>
-        <alias index="81" name="" field="pression_entry"/>
-        <alias index="82" name="" field="pression_exit"/>
-        <alias index="83" name="" field="depth_valveshaft"/>
-        <alias index="84" name="" field="regulator_situation"/>
-        <alias index="85" name="" field="regulator_location"/>
-        <alias index="86" name="" field="regulator_observ"/>
-        <alias index="87" name="" field="lin_meters"/>
-        <alias index="88" name="" field="exit_type"/>
-        <alias index="89" name="" field="exit_code"/>
-        <alias index="90" name="" field="drive_type"/>
-        <alias index="91" name="" field="cat_valve2"/>
-        <alias index="92" name="" field="ordinarystatus"/>
-        <alias index="93" name="" field="shutter"/>
-        <alias index="94" name="" field="brand"/>
-        <alias index="95" name="" field="brand2"/>
-        <alias index="96" name="" field="model"/>
-        <alias index="97" name="" field="model2"/>
-        <alias index="98" name="" field="greenvalve_param_1"/>
-        <alias index="99" name="" field="greenvalve_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="closed" name="" index="77"/>
+        <alias field="broken" name="" index="78"/>
+        <alias field="buried" name="" index="79"/>
+        <alias field="irrigation_indicator" name="" index="80"/>
+        <alias field="pression_entry" name="" index="81"/>
+        <alias field="pression_exit" name="" index="82"/>
+        <alias field="depth_valveshaft" name="" index="83"/>
+        <alias field="regulator_situation" name="" index="84"/>
+        <alias field="regulator_location" name="" index="85"/>
+        <alias field="regulator_observ" name="" index="86"/>
+        <alias field="lin_meters" name="" index="87"/>
+        <alias field="exit_type" name="" index="88"/>
+        <alias field="exit_code" name="" index="89"/>
+        <alias field="drive_type" name="" index="90"/>
+        <alias field="cat_valve2" name="" index="91"/>
+        <alias field="ordinarystatus" name="" index="92"/>
+        <alias field="shutter" name="" index="93"/>
+        <alias field="brand" name="" index="94"/>
+        <alias field="brand2" name="" index="95"/>
+        <alias field="model" name="" index="96"/>
+        <alias field="model2" name="" index="97"/>
+        <alias field="greenvalve_param_1" name="" index="98"/>
+        <alias field="greenvalve_param_2" name="" index="99"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="buried" applyOnUpdate="0"/>
-        <default expression="" field="irrigation_indicator" applyOnUpdate="0"/>
-        <default expression="" field="pression_entry" applyOnUpdate="0"/>
-        <default expression="" field="pression_exit" applyOnUpdate="0"/>
-        <default expression="" field="depth_valveshaft" applyOnUpdate="0"/>
-        <default expression="" field="regulator_situation" applyOnUpdate="0"/>
-        <default expression="" field="regulator_location" applyOnUpdate="0"/>
-        <default expression="" field="regulator_observ" applyOnUpdate="0"/>
-        <default expression="" field="lin_meters" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_code" applyOnUpdate="0"/>
-        <default expression="" field="drive_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve2" applyOnUpdate="0"/>
-        <default expression="" field="ordinarystatus" applyOnUpdate="0"/>
-        <default expression="" field="shutter" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="brand2" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="model2" applyOnUpdate="0"/>
-        <default expression="" field="greenvalve_param_1" applyOnUpdate="0"/>
-        <default expression="" field="greenvalve_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="buried" expression=""/>
+        <default applyOnUpdate="0" field="irrigation_indicator" expression=""/>
+        <default applyOnUpdate="0" field="pression_entry" expression=""/>
+        <default applyOnUpdate="0" field="pression_exit" expression=""/>
+        <default applyOnUpdate="0" field="depth_valveshaft" expression=""/>
+        <default applyOnUpdate="0" field="regulator_situation" expression=""/>
+        <default applyOnUpdate="0" field="regulator_location" expression=""/>
+        <default applyOnUpdate="0" field="regulator_observ" expression=""/>
+        <default applyOnUpdate="0" field="lin_meters" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_code" expression=""/>
+        <default applyOnUpdate="0" field="drive_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve2" expression=""/>
+        <default applyOnUpdate="0" field="ordinarystatus" expression=""/>
+        <default applyOnUpdate="0" field="shutter" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="brand2" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="model2" expression=""/>
+        <default applyOnUpdate="0" field="greenvalve_param_1" expression=""/>
+        <default applyOnUpdate="0" field="greenvalve_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buried"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="irrigation_indicator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_entry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth_valveshaft"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_situation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_location"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lin_meters"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drive_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ordinarystatus"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shutter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="greenvalve_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="greenvalve_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buried" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="irrigation_indicator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_entry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth_valveshaft" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_situation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_location" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lin_meters" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drive_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ordinarystatus" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shutter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="greenvalve_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="greenvalve_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="buried"/>
-        <constraint desc="" exp="" field="irrigation_indicator"/>
-        <constraint desc="" exp="" field="pression_entry"/>
-        <constraint desc="" exp="" field="pression_exit"/>
-        <constraint desc="" exp="" field="depth_valveshaft"/>
-        <constraint desc="" exp="" field="regulator_situation"/>
-        <constraint desc="" exp="" field="regulator_location"/>
-        <constraint desc="" exp="" field="regulator_observ"/>
-        <constraint desc="" exp="" field="lin_meters"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_code"/>
-        <constraint desc="" exp="" field="drive_type"/>
-        <constraint desc="" exp="" field="cat_valve2"/>
-        <constraint desc="" exp="" field="ordinarystatus"/>
-        <constraint desc="" exp="" field="shutter"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="brand2"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="model2"/>
-        <constraint desc="" exp="" field="greenvalve_param_1"/>
-        <constraint desc="" exp="" field="greenvalve_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="buried" desc=""/>
+        <constraint exp="" field="irrigation_indicator" desc=""/>
+        <constraint exp="" field="pression_entry" desc=""/>
+        <constraint exp="" field="pression_exit" desc=""/>
+        <constraint exp="" field="depth_valveshaft" desc=""/>
+        <constraint exp="" field="regulator_situation" desc=""/>
+        <constraint exp="" field="regulator_location" desc=""/>
+        <constraint exp="" field="regulator_observ" desc=""/>
+        <constraint exp="" field="lin_meters" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_code" desc=""/>
+        <constraint exp="" field="drive_type" desc=""/>
+        <constraint exp="" field="cat_valve2" desc=""/>
+        <constraint exp="" field="ordinarystatus" desc=""/>
+        <constraint exp="" field="shutter" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="brand2" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="model2" desc=""/>
+        <constraint exp="" field="greenvalve_param_1" desc=""/>
+        <constraint exp="" field="greenvalve_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -62516,93 +62077,93 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="buried" width="-1"/>
-          <column type="field" hidden="0" name="irrigation_indicator" width="-1"/>
-          <column type="field" hidden="0" name="pression_entry" width="-1"/>
-          <column type="field" hidden="0" name="pression_exit" width="-1"/>
-          <column type="field" hidden="0" name="depth_valveshaft" width="-1"/>
-          <column type="field" hidden="0" name="regulator_situation" width="-1"/>
-          <column type="field" hidden="0" name="regulator_location" width="-1"/>
-          <column type="field" hidden="0" name="regulator_observ" width="-1"/>
-          <column type="field" hidden="0" name="lin_meters" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_code" width="-1"/>
-          <column type="field" hidden="0" name="drive_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve2" width="-1"/>
-          <column type="field" hidden="0" name="greenvalve_param_1" width="-1"/>
-          <column type="field" hidden="0" name="greenvalve_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="ordinarystatus" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="buried"/>
+          <column type="field" width="-1" hidden="0" name="irrigation_indicator"/>
+          <column type="field" width="-1" hidden="0" name="pression_entry"/>
+          <column type="field" width="-1" hidden="0" name="pression_exit"/>
+          <column type="field" width="-1" hidden="0" name="depth_valveshaft"/>
+          <column type="field" width="-1" hidden="0" name="regulator_situation"/>
+          <column type="field" width="-1" hidden="0" name="regulator_location"/>
+          <column type="field" width="-1" hidden="0" name="regulator_observ"/>
+          <column type="field" width="-1" hidden="0" name="lin_meters"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_code"/>
+          <column type="field" width="-1" hidden="0" name="drive_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve2"/>
+          <column type="field" width="-1" hidden="0" name="greenvalve_param_1"/>
+          <column type="field" width="-1" hidden="0" name="greenvalve_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="ordinarystatus"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -62815,7 +62376,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -62874,7 +62435,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -62898,71 +62459,71 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -62979,22 +62540,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -63603,358 +63164,358 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="fire_code"/>
-        <alias index="78" name="" field="communication"/>
-        <alias index="79" name="" field="valve"/>
-        <alias index="80" name="" field="geom1"/>
-        <alias index="81" name="" field="geom2"/>
-        <alias index="82" name="" field="brand"/>
-        <alias index="83" name="" field="model"/>
-        <alias index="84" name="" field="hydrant_param_1"/>
-        <alias index="85" name="" field="hydrant_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="fire_code" name="" index="77"/>
+        <alias field="communication" name="" index="78"/>
+        <alias field="valve" name="" index="79"/>
+        <alias field="geom1" name="" index="80"/>
+        <alias field="geom2" name="" index="81"/>
+        <alias field="brand" name="" index="82"/>
+        <alias field="model" name="" index="83"/>
+        <alias field="hydrant_param_1" name="" index="84"/>
+        <alias field="hydrant_param_2" name="" index="85"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="fire_code" applyOnUpdate="0"/>
-        <default expression="" field="communication" applyOnUpdate="0"/>
-        <default expression="" field="valve" applyOnUpdate="0"/>
-        <default expression="" field="geom1" applyOnUpdate="0"/>
-        <default expression="" field="geom2" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="hydrant_param_1" applyOnUpdate="0"/>
-        <default expression="" field="hydrant_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="fire_code" expression=""/>
+        <default applyOnUpdate="0" field="communication" expression=""/>
+        <default applyOnUpdate="0" field="valve" expression=""/>
+        <default applyOnUpdate="0" field="geom1" expression=""/>
+        <default applyOnUpdate="0" field="geom2" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="hydrant_param_1" expression=""/>
+        <default applyOnUpdate="0" field="hydrant_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fire_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="communication"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="valve"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geom1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="geom2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hydrant_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hydrant_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fire_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="communication" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valve" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hydrant_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hydrant_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="fire_code"/>
-        <constraint desc="" exp="" field="communication"/>
-        <constraint desc="" exp="" field="valve"/>
-        <constraint desc="" exp="" field="geom1"/>
-        <constraint desc="" exp="" field="geom2"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="hydrant_param_1"/>
-        <constraint desc="" exp="" field="hydrant_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="fire_code" desc=""/>
+        <constraint exp="" field="communication" desc=""/>
+        <constraint exp="" field="valve" desc=""/>
+        <constraint exp="" field="geom1" desc=""/>
+        <constraint exp="" field="geom2" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="hydrant_param_1" desc=""/>
+        <constraint exp="" field="hydrant_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -63962,80 +63523,80 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="fire_code" width="-1"/>
-          <column type="field" hidden="0" name="communication" width="-1"/>
-          <column type="field" hidden="0" name="valve" width="-1"/>
-          <column type="field" hidden="0" name="hydrant_param_1" width="-1"/>
-          <column type="field" hidden="0" name="hydrant_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="fire_code"/>
+          <column type="field" width="-1" hidden="0" name="communication"/>
+          <column type="field" width="-1" hidden="0" name="valve"/>
+          <column type="field" width="-1" hidden="0" name="hydrant_param_1"/>
+          <column type="field" width="-1" hidden="0" name="hydrant_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -64222,7 +63783,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -64281,7 +63842,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -64305,33 +63866,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -64348,22 +63909,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -64909,322 +64470,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -65232,74 +64793,74 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -65472,7 +65033,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <id>ve_node_manhole_4e3a3ca1_25b5_4374_b3df_884dd04b98ce</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_node_manhole" (the_geom) sql=</datasource>
       <keywordList>
@@ -65525,7 +65086,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -65549,59 +65110,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -65618,22 +65179,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -66186,326 +65747,326 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="name"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="name" name="" index="77"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -66513,76 +66074,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -66761,7 +66322,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -66820,7 +66381,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -66844,59 +66405,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="129,10,78,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -66913,22 +66474,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -67495,334 +67056,334 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="serial_number"/>
-        <alias index="78" name="" field="brand"/>
-        <alias index="79" name="" field="model"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="serial_number" name="" index="77"/>
+        <alias field="brand" name="" index="78"/>
+        <alias field="model" name="" index="79"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="serial_number" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="serial_number"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="serial_number"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -67830,76 +67391,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="serial_number" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -68078,7 +67639,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -68137,7 +67698,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -68161,59 +67722,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -68230,22 +67791,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -68798,326 +68359,326 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="lab_code"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="lab_code" name="" index="77"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="lab_code" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lab_code"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="lab_code"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -69125,76 +68686,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="lab_code" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -69373,7 +68934,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -69432,7 +68993,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -69456,71 +69017,71 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="239,110,108,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="239,110,108,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="239,110,108,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="239,110,108,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="242,242,242,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.40000000000000008"/>
-              <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="242,242,242,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="242,242,242,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.40000000000000008" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="242,242,242,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -69537,22 +69098,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -70259,414 +69820,414 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="closed"/>
-        <alias index="78" name="" field="broken"/>
-        <alias index="79" name="" field="buried"/>
-        <alias index="80" name="" field="irrigation_indicator"/>
-        <alias index="81" name="" field="pression_entry"/>
-        <alias index="82" name="" field="pression_exit"/>
-        <alias index="83" name="" field="depth_valveshaft"/>
-        <alias index="84" name="" field="regulator_situation"/>
-        <alias index="85" name="" field="regulator_location"/>
-        <alias index="86" name="" field="regulator_observ"/>
-        <alias index="87" name="" field="lin_meters"/>
-        <alias index="88" name="" field="exit_type"/>
-        <alias index="89" name="" field="exit_code"/>
-        <alias index="90" name="" field="drive_type"/>
-        <alias index="91" name="" field="cat_valve2"/>
-        <alias index="92" name="" field="ordinarystatus"/>
-        <alias index="93" name="" field="shutter"/>
-        <alias index="94" name="" field="brand"/>
-        <alias index="95" name="" field="brand2"/>
-        <alias index="96" name="" field="model"/>
-        <alias index="97" name="" field="model2"/>
-        <alias index="98" name="" field="outfallvalve_param_1"/>
-        <alias index="99" name="" field="outfallvalve_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="closed" name="" index="77"/>
+        <alias field="broken" name="" index="78"/>
+        <alias field="buried" name="" index="79"/>
+        <alias field="irrigation_indicator" name="" index="80"/>
+        <alias field="pression_entry" name="" index="81"/>
+        <alias field="pression_exit" name="" index="82"/>
+        <alias field="depth_valveshaft" name="" index="83"/>
+        <alias field="regulator_situation" name="" index="84"/>
+        <alias field="regulator_location" name="" index="85"/>
+        <alias field="regulator_observ" name="" index="86"/>
+        <alias field="lin_meters" name="" index="87"/>
+        <alias field="exit_type" name="" index="88"/>
+        <alias field="exit_code" name="" index="89"/>
+        <alias field="drive_type" name="" index="90"/>
+        <alias field="cat_valve2" name="" index="91"/>
+        <alias field="ordinarystatus" name="" index="92"/>
+        <alias field="shutter" name="" index="93"/>
+        <alias field="brand" name="" index="94"/>
+        <alias field="brand2" name="" index="95"/>
+        <alias field="model" name="" index="96"/>
+        <alias field="model2" name="" index="97"/>
+        <alias field="outfallvalve_param_1" name="" index="98"/>
+        <alias field="outfallvalve_param_2" name="" index="99"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="buried" applyOnUpdate="0"/>
-        <default expression="" field="irrigation_indicator" applyOnUpdate="0"/>
-        <default expression="" field="pression_entry" applyOnUpdate="0"/>
-        <default expression="" field="pression_exit" applyOnUpdate="0"/>
-        <default expression="" field="depth_valveshaft" applyOnUpdate="0"/>
-        <default expression="" field="regulator_situation" applyOnUpdate="0"/>
-        <default expression="" field="regulator_location" applyOnUpdate="0"/>
-        <default expression="" field="regulator_observ" applyOnUpdate="0"/>
-        <default expression="" field="lin_meters" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_code" applyOnUpdate="0"/>
-        <default expression="" field="drive_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve2" applyOnUpdate="0"/>
-        <default expression="" field="ordinarystatus" applyOnUpdate="0"/>
-        <default expression="" field="shutter" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="brand2" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="model2" applyOnUpdate="0"/>
-        <default expression="" field="outfallvalve_param_1" applyOnUpdate="0"/>
-        <default expression="" field="outfallvalve_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="buried" expression=""/>
+        <default applyOnUpdate="0" field="irrigation_indicator" expression=""/>
+        <default applyOnUpdate="0" field="pression_entry" expression=""/>
+        <default applyOnUpdate="0" field="pression_exit" expression=""/>
+        <default applyOnUpdate="0" field="depth_valveshaft" expression=""/>
+        <default applyOnUpdate="0" field="regulator_situation" expression=""/>
+        <default applyOnUpdate="0" field="regulator_location" expression=""/>
+        <default applyOnUpdate="0" field="regulator_observ" expression=""/>
+        <default applyOnUpdate="0" field="lin_meters" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_code" expression=""/>
+        <default applyOnUpdate="0" field="drive_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve2" expression=""/>
+        <default applyOnUpdate="0" field="ordinarystatus" expression=""/>
+        <default applyOnUpdate="0" field="shutter" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="brand2" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="model2" expression=""/>
+        <default applyOnUpdate="0" field="outfallvalve_param_1" expression=""/>
+        <default applyOnUpdate="0" field="outfallvalve_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buried"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="irrigation_indicator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_entry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth_valveshaft"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_situation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_location"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lin_meters"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drive_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ordinarystatus"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shutter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="outfallvalve_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="outfallvalve_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buried" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="irrigation_indicator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_entry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth_valveshaft" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_situation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_location" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lin_meters" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drive_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ordinarystatus" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shutter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="outfallvalve_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="outfallvalve_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="buried"/>
-        <constraint desc="" exp="" field="irrigation_indicator"/>
-        <constraint desc="" exp="" field="pression_entry"/>
-        <constraint desc="" exp="" field="pression_exit"/>
-        <constraint desc="" exp="" field="depth_valveshaft"/>
-        <constraint desc="" exp="" field="regulator_situation"/>
-        <constraint desc="" exp="" field="regulator_location"/>
-        <constraint desc="" exp="" field="regulator_observ"/>
-        <constraint desc="" exp="" field="lin_meters"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_code"/>
-        <constraint desc="" exp="" field="drive_type"/>
-        <constraint desc="" exp="" field="cat_valve2"/>
-        <constraint desc="" exp="" field="ordinarystatus"/>
-        <constraint desc="" exp="" field="shutter"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="brand2"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="model2"/>
-        <constraint desc="" exp="" field="outfallvalve_param_1"/>
-        <constraint desc="" exp="" field="outfallvalve_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="buried" desc=""/>
+        <constraint exp="" field="irrigation_indicator" desc=""/>
+        <constraint exp="" field="pression_entry" desc=""/>
+        <constraint exp="" field="pression_exit" desc=""/>
+        <constraint exp="" field="depth_valveshaft" desc=""/>
+        <constraint exp="" field="regulator_situation" desc=""/>
+        <constraint exp="" field="regulator_location" desc=""/>
+        <constraint exp="" field="regulator_observ" desc=""/>
+        <constraint exp="" field="lin_meters" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_code" desc=""/>
+        <constraint exp="" field="drive_type" desc=""/>
+        <constraint exp="" field="cat_valve2" desc=""/>
+        <constraint exp="" field="ordinarystatus" desc=""/>
+        <constraint exp="" field="shutter" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="brand2" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="model2" desc=""/>
+        <constraint exp="" field="outfallvalve_param_1" desc=""/>
+        <constraint exp="" field="outfallvalve_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -70674,93 +70235,93 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="buried" width="-1"/>
-          <column type="field" hidden="0" name="irrigation_indicator" width="-1"/>
-          <column type="field" hidden="0" name="pression_entry" width="-1"/>
-          <column type="field" hidden="0" name="pression_exit" width="-1"/>
-          <column type="field" hidden="0" name="depth_valveshaft" width="-1"/>
-          <column type="field" hidden="0" name="regulator_situation" width="-1"/>
-          <column type="field" hidden="0" name="regulator_location" width="-1"/>
-          <column type="field" hidden="0" name="regulator_observ" width="-1"/>
-          <column type="field" hidden="0" name="lin_meters" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_code" width="-1"/>
-          <column type="field" hidden="0" name="drive_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve2" width="-1"/>
-          <column type="field" hidden="0" name="outfallvalve_param_1" width="-1"/>
-          <column type="field" hidden="0" name="outfallvalve_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="ordinarystatus" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="buried"/>
+          <column type="field" width="-1" hidden="0" name="irrigation_indicator"/>
+          <column type="field" width="-1" hidden="0" name="pression_entry"/>
+          <column type="field" width="-1" hidden="0" name="pression_exit"/>
+          <column type="field" width="-1" hidden="0" name="depth_valveshaft"/>
+          <column type="field" width="-1" hidden="0" name="regulator_situation"/>
+          <column type="field" width="-1" hidden="0" name="regulator_location"/>
+          <column type="field" width="-1" hidden="0" name="regulator_observ"/>
+          <column type="field" width="-1" hidden="0" name="lin_meters"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_code"/>
+          <column type="field" width="-1" hidden="0" name="drive_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve2"/>
+          <column type="field" width="-1" hidden="0" name="outfallvalve_param_1"/>
+          <column type="field" width="-1" hidden="0" name="outfallvalve_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="ordinarystatus"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -70973,7 +70534,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -71032,7 +70593,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -71056,71 +70617,71 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="135,221,121,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="135,221,121,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -71137,22 +70698,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -71845,406 +71406,406 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="closed"/>
-        <alias index="78" name="" field="broken"/>
-        <alias index="79" name="" field="buried"/>
-        <alias index="80" name="" field="irrigation_indicator"/>
-        <alias index="81" name="" field="pression_entry"/>
-        <alias index="82" name="" field="pression_exit"/>
-        <alias index="83" name="" field="depth_valveshaft"/>
-        <alias index="84" name="" field="regulator_situation"/>
-        <alias index="85" name="" field="regulator_location"/>
-        <alias index="86" name="" field="regulator_observ"/>
-        <alias index="87" name="" field="lin_meters"/>
-        <alias index="88" name="" field="exit_type"/>
-        <alias index="89" name="" field="exit_code"/>
-        <alias index="90" name="" field="drive_type"/>
-        <alias index="91" name="" field="cat_valve2"/>
-        <alias index="92" name="" field="ordinarystatus"/>
-        <alias index="93" name="" field="shutter"/>
-        <alias index="94" name="" field="brand"/>
-        <alias index="95" name="" field="brand2"/>
-        <alias index="96" name="" field="model"/>
-        <alias index="97" name="" field="model2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="closed" name="" index="77"/>
+        <alias field="broken" name="" index="78"/>
+        <alias field="buried" name="" index="79"/>
+        <alias field="irrigation_indicator" name="" index="80"/>
+        <alias field="pression_entry" name="" index="81"/>
+        <alias field="pression_exit" name="" index="82"/>
+        <alias field="depth_valveshaft" name="" index="83"/>
+        <alias field="regulator_situation" name="" index="84"/>
+        <alias field="regulator_location" name="" index="85"/>
+        <alias field="regulator_observ" name="" index="86"/>
+        <alias field="lin_meters" name="" index="87"/>
+        <alias field="exit_type" name="" index="88"/>
+        <alias field="exit_code" name="" index="89"/>
+        <alias field="drive_type" name="" index="90"/>
+        <alias field="cat_valve2" name="" index="91"/>
+        <alias field="ordinarystatus" name="" index="92"/>
+        <alias field="shutter" name="" index="93"/>
+        <alias field="brand" name="" index="94"/>
+        <alias field="brand2" name="" index="95"/>
+        <alias field="model" name="" index="96"/>
+        <alias field="model2" name="" index="97"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="buried" applyOnUpdate="0"/>
-        <default expression="" field="irrigation_indicator" applyOnUpdate="0"/>
-        <default expression="" field="pression_entry" applyOnUpdate="0"/>
-        <default expression="" field="pression_exit" applyOnUpdate="0"/>
-        <default expression="" field="depth_valveshaft" applyOnUpdate="0"/>
-        <default expression="" field="regulator_situation" applyOnUpdate="0"/>
-        <default expression="" field="regulator_location" applyOnUpdate="0"/>
-        <default expression="" field="regulator_observ" applyOnUpdate="0"/>
-        <default expression="" field="lin_meters" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_code" applyOnUpdate="0"/>
-        <default expression="" field="drive_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve2" applyOnUpdate="0"/>
-        <default expression="" field="ordinarystatus" applyOnUpdate="0"/>
-        <default expression="" field="shutter" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="brand2" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="model2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="buried" expression=""/>
+        <default applyOnUpdate="0" field="irrigation_indicator" expression=""/>
+        <default applyOnUpdate="0" field="pression_entry" expression=""/>
+        <default applyOnUpdate="0" field="pression_exit" expression=""/>
+        <default applyOnUpdate="0" field="depth_valveshaft" expression=""/>
+        <default applyOnUpdate="0" field="regulator_situation" expression=""/>
+        <default applyOnUpdate="0" field="regulator_location" expression=""/>
+        <default applyOnUpdate="0" field="regulator_observ" expression=""/>
+        <default applyOnUpdate="0" field="lin_meters" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_code" expression=""/>
+        <default applyOnUpdate="0" field="drive_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve2" expression=""/>
+        <default applyOnUpdate="0" field="ordinarystatus" expression=""/>
+        <default applyOnUpdate="0" field="shutter" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="brand2" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="model2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buried"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="irrigation_indicator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_entry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth_valveshaft"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_situation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_location"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lin_meters"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drive_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ordinarystatus"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shutter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buried" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="irrigation_indicator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_entry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth_valveshaft" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_situation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_location" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lin_meters" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drive_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ordinarystatus" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shutter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="buried"/>
-        <constraint desc="" exp="" field="irrigation_indicator"/>
-        <constraint desc="" exp="" field="pression_entry"/>
-        <constraint desc="" exp="" field="pression_exit"/>
-        <constraint desc="" exp="" field="depth_valveshaft"/>
-        <constraint desc="" exp="" field="regulator_situation"/>
-        <constraint desc="" exp="" field="regulator_location"/>
-        <constraint desc="" exp="" field="regulator_observ"/>
-        <constraint desc="" exp="" field="lin_meters"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_code"/>
-        <constraint desc="" exp="" field="drive_type"/>
-        <constraint desc="" exp="" field="cat_valve2"/>
-        <constraint desc="" exp="" field="ordinarystatus"/>
-        <constraint desc="" exp="" field="shutter"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="brand2"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="model2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="buried" desc=""/>
+        <constraint exp="" field="irrigation_indicator" desc=""/>
+        <constraint exp="" field="pression_entry" desc=""/>
+        <constraint exp="" field="pression_exit" desc=""/>
+        <constraint exp="" field="depth_valveshaft" desc=""/>
+        <constraint exp="" field="regulator_situation" desc=""/>
+        <constraint exp="" field="regulator_location" desc=""/>
+        <constraint exp="" field="regulator_observ" desc=""/>
+        <constraint exp="" field="lin_meters" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_code" desc=""/>
+        <constraint exp="" field="drive_type" desc=""/>
+        <constraint exp="" field="cat_valve2" desc=""/>
+        <constraint exp="" field="ordinarystatus" desc=""/>
+        <constraint exp="" field="shutter" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="brand2" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="model2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -72252,91 +71813,91 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="buried" width="-1"/>
-          <column type="field" hidden="0" name="irrigation_indicator" width="-1"/>
-          <column type="field" hidden="0" name="pression_entry" width="-1"/>
-          <column type="field" hidden="0" name="pression_exit" width="-1"/>
-          <column type="field" hidden="0" name="depth_valveshaft" width="-1"/>
-          <column type="field" hidden="0" name="regulator_situation" width="-1"/>
-          <column type="field" hidden="0" name="regulator_location" width="-1"/>
-          <column type="field" hidden="0" name="regulator_observ" width="-1"/>
-          <column type="field" hidden="0" name="lin_meters" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_code" width="-1"/>
-          <column type="field" hidden="0" name="drive_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="ordinarystatus" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="buried"/>
+          <column type="field" width="-1" hidden="0" name="irrigation_indicator"/>
+          <column type="field" width="-1" hidden="0" name="pression_entry"/>
+          <column type="field" width="-1" hidden="0" name="pression_exit"/>
+          <column type="field" width="-1" hidden="0" name="depth_valveshaft"/>
+          <column type="field" width="-1" hidden="0" name="regulator_situation"/>
+          <column type="field" width="-1" hidden="0" name="regulator_location"/>
+          <column type="field" width="-1" hidden="0" name="regulator_observ"/>
+          <column type="field" width="-1" hidden="0" name="lin_meters"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_code"/>
+          <column type="field" width="-1" hidden="0" name="drive_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="ordinarystatus"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -72545,7 +72106,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -72604,7 +72165,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -72628,59 +72189,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="198,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="198,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -72697,22 +72258,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -73286,338 +72847,338 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="brand"/>
-        <alias index="78" name="" field="model"/>
-        <alias index="79" name="" field="pressmeter_param_1"/>
-        <alias index="80" name="" field="pressmeter_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="brand" name="" index="77"/>
+        <alias field="model" name="" index="78"/>
+        <alias field="pressmeter_param_1" name="" index="79"/>
+        <alias field="pressmeter_param_2" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="pressmeter_param_1" applyOnUpdate="0"/>
-        <default expression="" field="pressmeter_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="pressmeter_param_1" expression=""/>
+        <default applyOnUpdate="0" field="pressmeter_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressmeter_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressmeter_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressmeter_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressmeter_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="pressmeter_param_1"/>
-        <constraint desc="" exp="" field="pressmeter_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="pressmeter_param_1" desc=""/>
+        <constraint exp="" field="pressmeter_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -73625,77 +73186,77 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="pressmeter_param_1" width="-1"/>
-          <column type="field" hidden="0" name="pressmeter_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="pressmeter_param_1"/>
+          <column type="field" width="-1" hidden="0" name="pressmeter_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -73876,7 +73437,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -73935,7 +73496,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -73959,59 +73520,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -74028,22 +73589,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -74659,362 +74220,362 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="max_flow"/>
-        <alias index="78" name="" field="min_flow"/>
-        <alias index="79" name="" field="nom_flow"/>
-        <alias index="80" name="" field="power"/>
-        <alias index="81" name="" field="pressure"/>
-        <alias index="82" name="" field="elev_height"/>
-        <alias index="83" name="" field="name"/>
-        <alias index="84" name="" field="pump_number"/>
-        <alias index="85" name="" field="brand"/>
-        <alias index="86" name="" field="model"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="max_flow" name="" index="77"/>
+        <alias field="min_flow" name="" index="78"/>
+        <alias field="nom_flow" name="" index="79"/>
+        <alias field="power" name="" index="80"/>
+        <alias field="pressure" name="" index="81"/>
+        <alias field="elev_height" name="" index="82"/>
+        <alias field="name" name="" index="83"/>
+        <alias field="pump_number" name="" index="84"/>
+        <alias field="brand" name="" index="85"/>
+        <alias field="model" name="" index="86"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="max_flow" applyOnUpdate="0"/>
-        <default expression="" field="min_flow" applyOnUpdate="0"/>
-        <default expression="" field="nom_flow" applyOnUpdate="0"/>
-        <default expression="" field="power" applyOnUpdate="0"/>
-        <default expression="" field="pressure" applyOnUpdate="0"/>
-        <default expression="" field="elev_height" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="pump_number" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="nom_flow" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="elev_height" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="pump_number" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="max_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="min_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nom_flow"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="power"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elev_height"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pump_number"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nom_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elev_height" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pump_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="max_flow"/>
-        <constraint desc="" exp="" field="min_flow"/>
-        <constraint desc="" exp="" field="nom_flow"/>
-        <constraint desc="" exp="" field="power"/>
-        <constraint desc="" exp="" field="pressure"/>
-        <constraint desc="" exp="" field="elev_height"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="pump_number"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="nom_flow" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="elev_height" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="pump_number" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -75022,83 +74583,83 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="max_flow" width="-1"/>
-          <column type="field" hidden="0" name="min_flow" width="-1"/>
-          <column type="field" hidden="0" name="nom_flow" width="-1"/>
-          <column type="field" hidden="0" name="power" width="-1"/>
-          <column type="field" hidden="0" name="pressure" width="-1"/>
-          <column type="field" hidden="0" name="elev_height" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="pump_number" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="nom_flow"/>
+          <column type="field" width="-1" hidden="0" name="power"/>
+          <column type="field" width="-1" hidden="0" name="pressure"/>
+          <column type="field" width="-1" hidden="0" name="elev_height"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="pump_number"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -75291,7 +74852,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -75350,7 +74911,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -75374,59 +74935,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="67,67,67,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="67,67,67,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="67,67,67,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="67,67,67,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -75443,22 +75004,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -76018,330 +75579,330 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="diam1"/>
-        <alias index="78" name="" field="diam2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="diam1" name="" index="77"/>
+        <alias field="diam2" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="diam1" applyOnUpdate="0"/>
-        <default expression="" field="diam2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="diam1" expression=""/>
+        <default applyOnUpdate="0" field="diam2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="diam1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="diam2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diam1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diam2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="diam1"/>
-        <constraint desc="" exp="" field="diam2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="diam1" desc=""/>
+        <constraint exp="" field="diam2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -76349,77 +75910,77 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="diam1" width="-1"/>
-          <column type="field" hidden="0" name="diam2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="diam1"/>
+          <column type="field" width="-1" hidden="0" name="diam2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -76600,7 +76161,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -76659,7 +76220,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -76683,59 +76244,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -76752,22 +76313,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -77320,326 +76881,326 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="pol_id"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="pol_id" name="" index="77"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pol_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="pol_id"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -77647,76 +77208,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -77895,7 +77456,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -77954,7 +77515,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -77978,590 +77539,590 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{08c304ba-43b5-4a5c-a9b6-abf92a0dfc02}">
-          <rule key="{ecdbcdeb-74bf-4f53-90f7-648cc0ffff35}" symbol="0" filter=" &quot;closed&quot;  =   'false' AND  &quot;broken&quot;  =   'false' "/>
-          <rule key="{5f5a0677-1037-4f64-94c9-d6f151d8267c}" symbol="1" label="Broken" filter=" &quot;closed&quot;  =   'false' AND  &quot;broken&quot;  =   'true' "/>
-          <rule key="{177c5ee5-464b-453d-a2c5-4258a39fc690}" symbol="2" label="Closed" filter=" &quot;closed&quot;  =   'true' AND  &quot;broken&quot;  =   'false' "/>
-          <rule key="{a2addf36-b052-42fe-8bc0-be8ee128d229}" symbol="3" label="Closed and Broken" filter=" &quot;closed&quot;  =   'true' AND  &quot;broken&quot;  =   'true' "/>
+          <rule key="{ecdbcdeb-74bf-4f53-90f7-648cc0ffff35}" filter=" &quot;closed&quot;  =   'false' AND  &quot;broken&quot;  =   'false' " symbol="0"/>
+          <rule key="{5f5a0677-1037-4f64-94c9-d6f151d8267c}" filter=" &quot;closed&quot;  =   'false' AND  &quot;broken&quot;  =   'true' " label="Broken" symbol="1"/>
+          <rule key="{177c5ee5-464b-453d-a2c5-4258a39fc690}" filter=" &quot;closed&quot;  =   'true' AND  &quot;broken&quot;  =   'false' " label="Closed" symbol="2"/>
+          <rule key="{a2addf36-b052-42fe-8bc0-be8ee128d229}" filter=" &quot;closed&quot;  =   'true' AND  &quot;broken&quot;  =   'true' " label="Closed and Broken" symbol="3"/>
         </rules>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="B"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="2.19999999999999973,-3.00000000000000044"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="B" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="2.19999999999999973,-3.00000000000000044" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="r"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="3.60000000000000009,-3"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="r" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="3.60000000000000009,-3" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="o"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="5,-3"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="o" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="5,-3" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="C"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="2.20000000000000018,-3"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="C" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="2.20000000000000018,-3" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="l"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="3.39999999999999991,-2.99999999999999734"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="l" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="3.39999999999999991,-2.99999999999999734" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="o"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="4.59999999999999964,-2.99999999999999734"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="o" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="4.59999999999999964,-2.99999999999999734" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <prop k="outline_width" v="0.1"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0.1" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="angle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="B"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="2.19999999999999973,-3.00000000000000044"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="B" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="2.19999999999999973,-3.00000000000000044" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="r"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="3.60000000000000009,-3"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="r" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="3.60000000000000009,-3" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="o"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="5,-3"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="o" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="5,-3" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="C"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="2.20000000000000018,-5.60000000000000053"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="C" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="2.20000000000000018,-5.60000000000000053" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="l"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="3.39999999999999991,-5.60000000000000053"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="l" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="3.39999999999999991,-5.60000000000000053" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="o"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="4.59999999999999964,-5.60000000000000053"/>
-              <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_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="size" v="2.8"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="o" k="chr"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="4.59999999999999964,-5.60000000000000053" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -78576,22 +78137,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -79298,414 +78859,414 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="closed"/>
-        <alias index="78" name="" field="broken"/>
-        <alias index="79" name="" field="buried"/>
-        <alias index="80" name="" field="irrigation_indicator"/>
-        <alias index="81" name="" field="pression_entry"/>
-        <alias index="82" name="" field="pression_exit"/>
-        <alias index="83" name="" field="depth_valveshaft"/>
-        <alias index="84" name="" field="regulator_situation"/>
-        <alias index="85" name="" field="regulator_location"/>
-        <alias index="86" name="" field="regulator_observ"/>
-        <alias index="87" name="" field="lin_meters"/>
-        <alias index="88" name="" field="exit_type"/>
-        <alias index="89" name="" field="exit_code"/>
-        <alias index="90" name="" field="drive_type"/>
-        <alias index="91" name="" field="cat_valve2"/>
-        <alias index="92" name="" field="ordinarystatus"/>
-        <alias index="93" name="" field="shutter"/>
-        <alias index="94" name="" field="brand"/>
-        <alias index="95" name="" field="brand2"/>
-        <alias index="96" name="" field="model"/>
-        <alias index="97" name="" field="model2"/>
-        <alias index="98" name="" field="shtvalve_param_1"/>
-        <alias index="99" name="" field="shtvalve_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="closed" name="" index="77"/>
+        <alias field="broken" name="" index="78"/>
+        <alias field="buried" name="" index="79"/>
+        <alias field="irrigation_indicator" name="" index="80"/>
+        <alias field="pression_entry" name="" index="81"/>
+        <alias field="pression_exit" name="" index="82"/>
+        <alias field="depth_valveshaft" name="" index="83"/>
+        <alias field="regulator_situation" name="" index="84"/>
+        <alias field="regulator_location" name="" index="85"/>
+        <alias field="regulator_observ" name="" index="86"/>
+        <alias field="lin_meters" name="" index="87"/>
+        <alias field="exit_type" name="" index="88"/>
+        <alias field="exit_code" name="" index="89"/>
+        <alias field="drive_type" name="" index="90"/>
+        <alias field="cat_valve2" name="" index="91"/>
+        <alias field="ordinarystatus" name="" index="92"/>
+        <alias field="shutter" name="" index="93"/>
+        <alias field="brand" name="" index="94"/>
+        <alias field="brand2" name="" index="95"/>
+        <alias field="model" name="" index="96"/>
+        <alias field="model2" name="" index="97"/>
+        <alias field="shtvalve_param_1" name="" index="98"/>
+        <alias field="shtvalve_param_2" name="" index="99"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="closed" applyOnUpdate="0"/>
-        <default expression="" field="broken" applyOnUpdate="0"/>
-        <default expression="" field="buried" applyOnUpdate="0"/>
-        <default expression="" field="irrigation_indicator" applyOnUpdate="0"/>
-        <default expression="" field="pression_entry" applyOnUpdate="0"/>
-        <default expression="" field="pression_exit" applyOnUpdate="0"/>
-        <default expression="" field="depth_valveshaft" applyOnUpdate="0"/>
-        <default expression="" field="regulator_situation" applyOnUpdate="0"/>
-        <default expression="" field="regulator_location" applyOnUpdate="0"/>
-        <default expression="" field="regulator_observ" applyOnUpdate="0"/>
-        <default expression="" field="lin_meters" applyOnUpdate="0"/>
-        <default expression="" field="exit_type" applyOnUpdate="0"/>
-        <default expression="" field="exit_code" applyOnUpdate="0"/>
-        <default expression="" field="drive_type" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve2" applyOnUpdate="0"/>
-        <default expression="" field="ordinarystatus" applyOnUpdate="0"/>
-        <default expression="" field="shutter" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="brand2" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
-        <default expression="" field="model2" applyOnUpdate="0"/>
-        <default expression="" field="shtvalve_param_1" applyOnUpdate="0"/>
-        <default expression="" field="shtvalve_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="buried" expression=""/>
+        <default applyOnUpdate="0" field="irrigation_indicator" expression=""/>
+        <default applyOnUpdate="0" field="pression_entry" expression=""/>
+        <default applyOnUpdate="0" field="pression_exit" expression=""/>
+        <default applyOnUpdate="0" field="depth_valveshaft" expression=""/>
+        <default applyOnUpdate="0" field="regulator_situation" expression=""/>
+        <default applyOnUpdate="0" field="regulator_location" expression=""/>
+        <default applyOnUpdate="0" field="regulator_observ" expression=""/>
+        <default applyOnUpdate="0" field="lin_meters" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_code" expression=""/>
+        <default applyOnUpdate="0" field="drive_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve2" expression=""/>
+        <default applyOnUpdate="0" field="ordinarystatus" expression=""/>
+        <default applyOnUpdate="0" field="shutter" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="brand2" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
+        <default applyOnUpdate="0" field="model2" expression=""/>
+        <default applyOnUpdate="0" field="shtvalve_param_1" expression=""/>
+        <default applyOnUpdate="0" field="shtvalve_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="closed"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="broken"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buried"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="irrigation_indicator"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_entry"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pression_exit"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth_valveshaft"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_situation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_location"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="regulator_observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lin_meters"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="exit_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="drive_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ordinarystatus"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shutter"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shtvalve_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="shtvalve_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buried" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="irrigation_indicator" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_entry" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pression_exit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth_valveshaft" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_situation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_location" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="regulator_observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lin_meters" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="drive_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ordinarystatus" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shutter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shtvalve_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="shtvalve_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="closed"/>
-        <constraint desc="" exp="" field="broken"/>
-        <constraint desc="" exp="" field="buried"/>
-        <constraint desc="" exp="" field="irrigation_indicator"/>
-        <constraint desc="" exp="" field="pression_entry"/>
-        <constraint desc="" exp="" field="pression_exit"/>
-        <constraint desc="" exp="" field="depth_valveshaft"/>
-        <constraint desc="" exp="" field="regulator_situation"/>
-        <constraint desc="" exp="" field="regulator_location"/>
-        <constraint desc="" exp="" field="regulator_observ"/>
-        <constraint desc="" exp="" field="lin_meters"/>
-        <constraint desc="" exp="" field="exit_type"/>
-        <constraint desc="" exp="" field="exit_code"/>
-        <constraint desc="" exp="" field="drive_type"/>
-        <constraint desc="" exp="" field="cat_valve2"/>
-        <constraint desc="" exp="" field="ordinarystatus"/>
-        <constraint desc="" exp="" field="shutter"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="brand2"/>
-        <constraint desc="" exp="" field="model"/>
-        <constraint desc="" exp="" field="model2"/>
-        <constraint desc="" exp="" field="shtvalve_param_1"/>
-        <constraint desc="" exp="" field="shtvalve_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="buried" desc=""/>
+        <constraint exp="" field="irrigation_indicator" desc=""/>
+        <constraint exp="" field="pression_entry" desc=""/>
+        <constraint exp="" field="pression_exit" desc=""/>
+        <constraint exp="" field="depth_valveshaft" desc=""/>
+        <constraint exp="" field="regulator_situation" desc=""/>
+        <constraint exp="" field="regulator_location" desc=""/>
+        <constraint exp="" field="regulator_observ" desc=""/>
+        <constraint exp="" field="lin_meters" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_code" desc=""/>
+        <constraint exp="" field="drive_type" desc=""/>
+        <constraint exp="" field="cat_valve2" desc=""/>
+        <constraint exp="" field="ordinarystatus" desc=""/>
+        <constraint exp="" field="shutter" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="brand2" desc=""/>
+        <constraint exp="" field="model" desc=""/>
+        <constraint exp="" field="model2" desc=""/>
+        <constraint exp="" field="shtvalve_param_1" desc=""/>
+        <constraint exp="" field="shtvalve_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -79713,93 +79274,93 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="closed" width="-1"/>
-          <column type="field" hidden="0" name="broken" width="-1"/>
-          <column type="field" hidden="0" name="buried" width="-1"/>
-          <column type="field" hidden="0" name="irrigation_indicator" width="-1"/>
-          <column type="field" hidden="0" name="pression_entry" width="-1"/>
-          <column type="field" hidden="0" name="pression_exit" width="-1"/>
-          <column type="field" hidden="0" name="depth_valveshaft" width="-1"/>
-          <column type="field" hidden="0" name="regulator_situation" width="-1"/>
-          <column type="field" hidden="0" name="regulator_location" width="-1"/>
-          <column type="field" hidden="0" name="regulator_observ" width="-1"/>
-          <column type="field" hidden="0" name="lin_meters" width="-1"/>
-          <column type="field" hidden="0" name="exit_type" width="-1"/>
-          <column type="field" hidden="0" name="exit_code" width="-1"/>
-          <column type="field" hidden="0" name="drive_type" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve2" width="-1"/>
-          <column type="field" hidden="0" name="shtvalve_param_1" width="-1"/>
-          <column type="field" hidden="0" name="shtvalve_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
-          <column type="field" hidden="0" name="ordinarystatus" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="buried"/>
+          <column type="field" width="-1" hidden="0" name="irrigation_indicator"/>
+          <column type="field" width="-1" hidden="0" name="pression_entry"/>
+          <column type="field" width="-1" hidden="0" name="pression_exit"/>
+          <column type="field" width="-1" hidden="0" name="depth_valveshaft"/>
+          <column type="field" width="-1" hidden="0" name="regulator_situation"/>
+          <column type="field" width="-1" hidden="0" name="regulator_location"/>
+          <column type="field" width="-1" hidden="0" name="regulator_observ"/>
+          <column type="field" width="-1" hidden="0" name="lin_meters"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_code"/>
+          <column type="field" width="-1" hidden="0" name="drive_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve2"/>
+          <column type="field" width="-1" hidden="0" name="shtvalve_param_1"/>
+          <column type="field" width="-1" hidden="0" name="shtvalve_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="ordinarystatus"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -80012,7 +79573,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -80071,7 +79632,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -80095,59 +79656,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="38,38,38,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.20000000000000001"/>
-              <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="38,38,38,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="38,38,38,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="38,38,38,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -80164,22 +79725,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -80732,326 +80293,326 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="name"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="name" name="" index="77"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -81059,76 +80620,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -81307,7 +80868,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -81366,7 +80927,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -81390,33 +80951,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="170,161,161,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="1"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="170,161,161,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -81433,22 +80994,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -81994,322 +81555,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -82317,74 +81878,74 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -82557,7 +82118,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -82616,7 +82177,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -82640,59 +82201,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="38,38,38,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.20000000000000001"/>
-              <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="38,38,38,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="38,38,38,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="38,38,38,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -82709,22 +82270,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -83333,358 +82894,358 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="pol_id"/>
-        <alias index="78" name="" field="vmax"/>
-        <alias index="79" name="" field="vutil"/>
-        <alias index="80" name="" field="area"/>
-        <alias index="81" name="" field="chlorination"/>
-        <alias index="82" name="" field="name"/>
-        <alias index="83" name="" field="hmax"/>
-        <alias index="84" name="" field="tank_param_1"/>
-        <alias index="85" name="" field="tank_param_2"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="pol_id" name="" index="77"/>
+        <alias field="vmax" name="" index="78"/>
+        <alias field="vutil" name="" index="79"/>
+        <alias field="area" name="" index="80"/>
+        <alias field="chlorination" name="" index="81"/>
+        <alias field="name" name="" index="82"/>
+        <alias field="hmax" name="" index="83"/>
+        <alias field="tank_param_1" name="" index="84"/>
+        <alias field="tank_param_2" name="" index="85"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="vmax" applyOnUpdate="0"/>
-        <default expression="" field="vutil" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="chlorination" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="hmax" applyOnUpdate="0"/>
-        <default expression="" field="tank_param_1" applyOnUpdate="0"/>
-        <default expression="" field="tank_param_2" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="vmax" expression=""/>
+        <default applyOnUpdate="0" field="vutil" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="chlorination" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="hmax" expression=""/>
+        <default applyOnUpdate="0" field="tank_param_1" expression=""/>
+        <default applyOnUpdate="0" field="tank_param_2" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vmax"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="vutil"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="chlorination"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hmax"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tank_param_1"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tank_param_2"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vmax" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vutil" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="area" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="chlorination" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hmax" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tank_param_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tank_param_2" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="vmax"/>
-        <constraint desc="" exp="" field="vutil"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="chlorination"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hmax"/>
-        <constraint desc="" exp="" field="tank_param_1"/>
-        <constraint desc="" exp="" field="tank_param_2"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="vmax" desc=""/>
+        <constraint exp="" field="vutil" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="chlorination" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="hmax" desc=""/>
+        <constraint exp="" field="tank_param_1" desc=""/>
+        <constraint exp="" field="tank_param_2" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -83692,83 +83253,83 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="vmax" width="-1"/>
-          <column type="field" hidden="0" name="vutil" width="-1"/>
-          <column type="field" hidden="0" name="area" width="-1"/>
-          <column type="field" hidden="0" name="chlorination" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="field" hidden="0" name="tank_param_1" width="-1"/>
-          <column type="field" hidden="0" name="tank_param_2" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="vmax"/>
+          <column type="field" width="-1" hidden="0" name="vutil"/>
+          <column type="field" width="-1" hidden="0" name="area"/>
+          <column type="field" width="-1" hidden="0" name="chlorination"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="tank_param_1"/>
+          <column type="field" width="-1" hidden="0" name="tank_param_2"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -83961,7 +83522,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -84020,7 +83581,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -84044,60 +83605,60 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -84114,22 +83675,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -84710,342 +84271,342 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="customer_code"/>
-        <alias index="78" name="" field="top_floor"/>
-        <alias index="79" name="" field="cat_valve"/>
-        <alias index="80" name="" field="brand"/>
-        <alias index="81" name="" field="model"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="customer_code" name="" index="77"/>
+        <alias field="top_floor" name="" index="78"/>
+        <alias field="cat_valve" name="" index="79"/>
+        <alias field="brand" name="" index="80"/>
+        <alias field="model" name="" index="81"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="customer_code" applyOnUpdate="0"/>
-        <default expression="" field="top_floor" applyOnUpdate="0"/>
-        <default expression="" field="cat_valve" applyOnUpdate="0"/>
-        <default expression="" field="brand" applyOnUpdate="0"/>
-        <default expression="" field="model" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="top_floor" expression=""/>
+        <default applyOnUpdate="0" field="cat_valve" expression=""/>
+        <default applyOnUpdate="0" field="brand" expression=""/>
+        <default applyOnUpdate="0" field="model" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="customer_code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="top_floor"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_valve"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="brand"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="model"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="top_floor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_valve" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="brand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="model" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="customer_code"/>
-        <constraint desc="" exp="" field="top_floor"/>
-        <constraint desc="" exp="" field="cat_valve"/>
-        <constraint desc="" exp="" field="brand"/>
-        <constraint desc="" exp="" field="model"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="top_floor" desc=""/>
+        <constraint exp="" field="cat_valve" desc=""/>
+        <constraint exp="" field="brand" desc=""/>
+        <constraint exp="" field="model" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -85053,77 +84614,77 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="customer_code" width="-1"/>
-          <column type="field" hidden="0" name="top_floor" width="-1"/>
-          <column type="field" hidden="0" name="cat_valve" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="top_floor"/>
+          <column type="field" width="-1" hidden="0" name="cat_valve"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -85302,7 +84863,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -85361,7 +84922,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -85385,59 +84946,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="38,38,38,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.40000000000000002,-0.20000000000000001"/>
-              <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="38,38,38,255"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="38,38,38,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.40000000000000002,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="38,38,38,255" k="outline_color"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -85454,22 +85015,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -86022,326 +85583,326 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="name"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="name" name="" index="77"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -86349,76 +85910,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -86597,7 +86158,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="25000" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="1" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>ve_node_wtp_07ad19e5_7967_4670_b0ad_42f78a157ca1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."ve_node_wtp" (the_geom) sql=</datasource>
       <keywordList>
@@ -86650,7 +86211,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -86674,59 +86235,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="FontMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -86737,79 +86298,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontLetterSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" isExpression="0" fontCapitals="0" textOrientation="horizontal" multilineHeight="1" fontFamily="MS Shell Dlg 2" fieldName="node_id" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" useSubstitutions="0" fontItalic="0" fontWordSpacing="0" fontSizeUnit="Point" fontUnderline="0" fontSize="8.25" blendMode="0" namedStyle="Normal">
-            <text-buffer bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="229,182,54,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="node_id" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="229,182,54,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" autoWrapLength="0" wrapChar="" multilineAlign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidInside="0" geometryGenerator="" repeatDistance="0" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="20" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" distUnits="MM" yOffset="0" overrunDistanceUnit="MM" layerType="PointGeometry" overrunDistance="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" placementFlags="10" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleMax="500" upsidedownLabels="0" fontMaxPixelSize="10000" drawLabels="1" obstacleFactor="1" scaleMin="1" fontLimitPixelSize="0" maxNumLabels="2000" obstacle="1" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleVisibility="1" minFeatureSize="0" obstacleType="0" labelPerPart="0" mergeLines="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="500" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
-              </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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;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;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 type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -86822,22 +86383,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -87390,326 +86951,326 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
-        <alias index="77" name="" field="name"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
+        <alias field="name" name="" index="77"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
-        <constraint desc="" exp="" field="name"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -87717,76 +87278,76 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="field" hidden="0" name="name" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" hidden="0" name="presszone_id" width="-1"/>
-          <column type="field" hidden="0" name="district_id" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -87965,7 +87526,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="2500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Point" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" wkbType="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="2500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -88024,7 +87585,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -88048,33 +87609,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="170,161,161,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="1"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="170,161,161,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -88091,22 +87652,22 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="0">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -88652,322 +88213,322 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="node_id"/>
-        <alias index="1" name="" field="code"/>
-        <alias index="2" name="" field="elevation"/>
-        <alias index="3" name="" field="depth"/>
-        <alias index="4" name="" field="node_type"/>
-        <alias index="5" name="" field="sys_type"/>
-        <alias index="6" name="" field="nodecat_id"/>
-        <alias index="7" name="" field="cat_matcat_id"/>
-        <alias index="8" name="" field="cat_pnom"/>
-        <alias index="9" name="" field="cat_dnom"/>
-        <alias index="10" name="" field="epa_type"/>
-        <alias index="11" name="" field="expl_id"/>
-        <alias index="12" name="" field="macroexpl_id"/>
-        <alias index="13" name="" field="sector_id"/>
-        <alias index="14" name="" field="sector_name"/>
-        <alias index="15" name="" field="macrosector_id"/>
-        <alias index="16" name="" field="arc_id"/>
-        <alias index="17" name="" field="parent_id"/>
-        <alias index="18" name="" field="state"/>
-        <alias index="19" name="" field="state_type"/>
-        <alias index="20" name="" field="annotation"/>
-        <alias index="21" name="" field="observ"/>
-        <alias index="22" name="" field="comment"/>
-        <alias index="23" name="" field="minsector_id"/>
-        <alias index="24" name="" field="dma_id"/>
-        <alias index="25" name="" field="dma_name"/>
-        <alias index="26" name="" field="macrodma_id"/>
-        <alias index="27" name="" field="presszone_id"/>
-        <alias index="28" name="" field="presszone_name"/>
-        <alias index="29" name="" field="staticpressure"/>
-        <alias index="30" name="" field="dqa_id"/>
-        <alias index="31" name="" field="dqa_name"/>
-        <alias index="32" name="" field="macrodqa_id"/>
-        <alias index="33" name="" field="soilcat_id"/>
-        <alias index="34" name="" field="function_type"/>
-        <alias index="35" name="" field="category_type"/>
-        <alias index="36" name="" field="fluid_type"/>
-        <alias index="37" name="" field="location_type"/>
-        <alias index="38" name="" field="workcat_id"/>
-        <alias index="39" name="" field="workcat_id_end"/>
-        <alias index="40" name="" field="builtdate"/>
-        <alias index="41" name="" field="enddate"/>
-        <alias index="42" name="" field="buildercat_id"/>
-        <alias index="43" name="" field="ownercat_id"/>
-        <alias index="44" name="" field="muni_id"/>
-        <alias index="45" name="" field="postcode"/>
-        <alias index="46" name="" field="district_id"/>
-        <alias index="47" name="" field="streetname"/>
-        <alias index="48" name="" field="postnumber"/>
-        <alias index="49" name="" field="postcomplement"/>
-        <alias index="50" name="" field="streetname2"/>
-        <alias index="51" name="" field="postnumber2"/>
-        <alias index="52" name="" field="postcomplement2"/>
-        <alias index="53" name="" field="descript"/>
-        <alias index="54" name="" field="svg"/>
-        <alias index="55" name="" field="rotation"/>
-        <alias index="56" name="" field="link"/>
-        <alias index="57" name="" field="verified"/>
-        <alias index="58" name="" field="undelete"/>
-        <alias index="59" name="" field="label"/>
-        <alias index="60" name="" field="label_x"/>
-        <alias index="61" name="" field="label_y"/>
-        <alias index="62" name="" field="label_rotation"/>
-        <alias index="63" name="" field="publish"/>
-        <alias index="64" name="" field="inventory"/>
-        <alias index="65" name="" field="hemisphere"/>
-        <alias index="66" name="" field="num_value"/>
-        <alias index="67" name="" field="nodetype_id"/>
-        <alias index="68" name="" field="tstamp"/>
-        <alias index="69" name="" field="insert_user"/>
-        <alias index="70" name="" field="lastupdate"/>
-        <alias index="71" name="" field="lastupdate_user"/>
-        <alias index="72" name="" field="adate"/>
-        <alias index="73" name="" field="adescript"/>
-        <alias index="74" name="" field="accessibility"/>
-        <alias index="75" name="" field="dma_style"/>
-        <alias index="76" name="" field="presszone_style"/>
+        <alias field="node_id" name="" index="0"/>
+        <alias field="code" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
+        <alias field="depth" name="" index="3"/>
+        <alias field="node_type" name="" index="4"/>
+        <alias field="sys_type" name="" index="5"/>
+        <alias field="nodecat_id" name="" index="6"/>
+        <alias field="cat_matcat_id" name="" index="7"/>
+        <alias field="cat_pnom" name="" index="8"/>
+        <alias field="cat_dnom" name="" index="9"/>
+        <alias field="epa_type" name="" index="10"/>
+        <alias field="expl_id" name="" index="11"/>
+        <alias field="macroexpl_id" name="" index="12"/>
+        <alias field="sector_id" name="" index="13"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
-        <default expression="" field="depth" applyOnUpdate="0"/>
-        <default expression="" field="node_type" applyOnUpdate="0"/>
-        <default expression="" field="sys_type" applyOnUpdate="0"/>
-        <default expression="" field="nodecat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_matcat_id" applyOnUpdate="0"/>
-        <default expression="" field="cat_pnom" applyOnUpdate="0"/>
-        <default expression="" field="cat_dnom" applyOnUpdate="0"/>
-        <default expression="" field="epa_type" applyOnUpdate="0"/>
-        <default expression="" field="expl_id" applyOnUpdate="0"/>
-        <default expression="" field="macroexpl_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_id" applyOnUpdate="0"/>
-        <default expression="" field="sector_name" applyOnUpdate="0"/>
-        <default expression="" field="macrosector_id" applyOnUpdate="0"/>
-        <default expression="" field="arc_id" applyOnUpdate="0"/>
-        <default expression="" field="parent_id" applyOnUpdate="0"/>
-        <default expression="" field="state" applyOnUpdate="0"/>
-        <default expression="" field="state_type" applyOnUpdate="0"/>
-        <default expression="" field="annotation" applyOnUpdate="0"/>
-        <default expression="" field="observ" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="minsector_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_id" applyOnUpdate="0"/>
-        <default expression="" field="dma_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodma_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_id" applyOnUpdate="0"/>
-        <default expression="" field="presszone_name" applyOnUpdate="0"/>
-        <default expression="" field="staticpressure" applyOnUpdate="0"/>
-        <default expression="" field="dqa_id" applyOnUpdate="0"/>
-        <default expression="" field="dqa_name" applyOnUpdate="0"/>
-        <default expression="" field="macrodqa_id" applyOnUpdate="0"/>
-        <default expression="" field="soilcat_id" applyOnUpdate="0"/>
-        <default expression="" field="function_type" applyOnUpdate="0"/>
-        <default expression="" field="category_type" applyOnUpdate="0"/>
-        <default expression="" field="fluid_type" applyOnUpdate="0"/>
-        <default expression="" field="location_type" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id" applyOnUpdate="0"/>
-        <default expression="" field="workcat_id_end" applyOnUpdate="0"/>
-        <default expression="" field="builtdate" applyOnUpdate="0"/>
-        <default expression="" field="enddate" applyOnUpdate="0"/>
-        <default expression="" field="buildercat_id" applyOnUpdate="0"/>
-        <default expression="" field="ownercat_id" applyOnUpdate="0"/>
-        <default expression="" field="muni_id" applyOnUpdate="0"/>
-        <default expression="" field="postcode" applyOnUpdate="0"/>
-        <default expression="" field="district_id" applyOnUpdate="0"/>
-        <default expression="" field="streetname" applyOnUpdate="0"/>
-        <default expression="" field="postnumber" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement" applyOnUpdate="0"/>
-        <default expression="" field="streetname2" applyOnUpdate="0"/>
-        <default expression="" field="postnumber2" applyOnUpdate="0"/>
-        <default expression="" field="postcomplement2" applyOnUpdate="0"/>
-        <default expression="" field="descript" applyOnUpdate="0"/>
-        <default expression="" field="svg" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
-        <default expression="" field="link" applyOnUpdate="0"/>
-        <default expression="" field="verified" applyOnUpdate="0"/>
-        <default expression="" field="undelete" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rotation" applyOnUpdate="0"/>
-        <default expression="" field="publish" applyOnUpdate="0"/>
-        <default expression="" field="inventory" applyOnUpdate="0"/>
-        <default expression="" field="hemisphere" applyOnUpdate="0"/>
-        <default expression="" field="num_value" applyOnUpdate="0"/>
-        <default expression="" field="nodetype_id" applyOnUpdate="0"/>
-        <default expression="" field="tstamp" applyOnUpdate="0"/>
-        <default expression="" field="insert_user" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate" applyOnUpdate="0"/>
-        <default expression="" field="lastupdate_user" applyOnUpdate="0"/>
-        <default expression="" field="adate" applyOnUpdate="0"/>
-        <default expression="" field="adescript" applyOnUpdate="0"/>
-        <default expression="" field="accessibility" applyOnUpdate="0"/>
-        <default expression="" field="dma_style" applyOnUpdate="0"/>
-        <default expression="" field="presszone_style" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="node_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="code"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="depth"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sys_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodecat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_matcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_pnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cat_dnom"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="epa_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="expl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macroexpl_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="sector_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrosector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="arc_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="parent_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="state_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="annotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="observ"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="minsector_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodma_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="staticpressure"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dqa_name"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="macrodqa_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="soilcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="function_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="category_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fluid_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="location_type"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="workcat_id_end"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="builtdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="enddate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="buildercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ownercat_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="muni_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcode"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="district_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="streetname2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postnumber2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="postcomplement2"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="svg"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="link"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="verified"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="undelete"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rotation"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="publish"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="inventory"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hemisphere"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="num_value"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="nodetype_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="tstamp"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="insert_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="lastupdate_user"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adate"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="adescript"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="accessibility"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="dma_style"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="presszone_style"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="node_id"/>
-        <constraint desc="" exp="" field="code"/>
-        <constraint desc="" exp="" field="elevation"/>
-        <constraint desc="" exp="" field="depth"/>
-        <constraint desc="" exp="" field="node_type"/>
-        <constraint desc="" exp="" field="sys_type"/>
-        <constraint desc="" exp="" field="nodecat_id"/>
-        <constraint desc="" exp="" field="cat_matcat_id"/>
-        <constraint desc="" exp="" field="cat_pnom"/>
-        <constraint desc="" exp="" field="cat_dnom"/>
-        <constraint desc="" exp="" field="epa_type"/>
-        <constraint desc="" exp="" field="expl_id"/>
-        <constraint desc="" exp="" field="macroexpl_id"/>
-        <constraint desc="" exp="" field="sector_id"/>
-        <constraint desc="" exp="" field="sector_name"/>
-        <constraint desc="" exp="" field="macrosector_id"/>
-        <constraint desc="" exp="" field="arc_id"/>
-        <constraint desc="" exp="" field="parent_id"/>
-        <constraint desc="" exp="" field="state"/>
-        <constraint desc="" exp="" field="state_type"/>
-        <constraint desc="" exp="" field="annotation"/>
-        <constraint desc="" exp="" field="observ"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="minsector_id"/>
-        <constraint desc="" exp="" field="dma_id"/>
-        <constraint desc="" exp="" field="dma_name"/>
-        <constraint desc="" exp="" field="macrodma_id"/>
-        <constraint desc="" exp="" field="presszone_id"/>
-        <constraint desc="" exp="" field="presszone_name"/>
-        <constraint desc="" exp="" field="staticpressure"/>
-        <constraint desc="" exp="" field="dqa_id"/>
-        <constraint desc="" exp="" field="dqa_name"/>
-        <constraint desc="" exp="" field="macrodqa_id"/>
-        <constraint desc="" exp="" field="soilcat_id"/>
-        <constraint desc="" exp="" field="function_type"/>
-        <constraint desc="" exp="" field="category_type"/>
-        <constraint desc="" exp="" field="fluid_type"/>
-        <constraint desc="" exp="" field="location_type"/>
-        <constraint desc="" exp="" field="workcat_id"/>
-        <constraint desc="" exp="" field="workcat_id_end"/>
-        <constraint desc="" exp="" field="builtdate"/>
-        <constraint desc="" exp="" field="enddate"/>
-        <constraint desc="" exp="" field="buildercat_id"/>
-        <constraint desc="" exp="" field="ownercat_id"/>
-        <constraint desc="" exp="" field="muni_id"/>
-        <constraint desc="" exp="" field="postcode"/>
-        <constraint desc="" exp="" field="district_id"/>
-        <constraint desc="" exp="" field="streetname"/>
-        <constraint desc="" exp="" field="postnumber"/>
-        <constraint desc="" exp="" field="postcomplement"/>
-        <constraint desc="" exp="" field="streetname2"/>
-        <constraint desc="" exp="" field="postnumber2"/>
-        <constraint desc="" exp="" field="postcomplement2"/>
-        <constraint desc="" exp="" field="descript"/>
-        <constraint desc="" exp="" field="svg"/>
-        <constraint desc="" exp="" field="rotation"/>
-        <constraint desc="" exp="" field="link"/>
-        <constraint desc="" exp="" field="verified"/>
-        <constraint desc="" exp="" field="undelete"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rotation"/>
-        <constraint desc="" exp="" field="publish"/>
-        <constraint desc="" exp="" field="inventory"/>
-        <constraint desc="" exp="" field="hemisphere"/>
-        <constraint desc="" exp="" field="num_value"/>
-        <constraint desc="" exp="" field="nodetype_id"/>
-        <constraint desc="" exp="" field="tstamp"/>
-        <constraint desc="" exp="" field="insert_user"/>
-        <constraint desc="" exp="" field="lastupdate"/>
-        <constraint desc="" exp="" field="lastupdate_user"/>
-        <constraint desc="" exp="" field="adate"/>
-        <constraint desc="" exp="" field="adescript"/>
-        <constraint desc="" exp="" field="accessibility"/>
-        <constraint desc="" exp="" field="dma_style"/>
-        <constraint desc="" exp="" field="presszone_style"/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -88975,74 +88536,74 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="field" hidden="0" name="code" width="-1"/>
-          <column type="field" hidden="0" name="elevation" width="-1"/>
-          <column type="field" hidden="0" name="depth" width="-1"/>
-          <column type="field" hidden="0" name="node_type" width="-1"/>
-          <column type="field" hidden="0" name="sys_type" width="-1"/>
-          <column type="field" hidden="0" name="nodecat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_matcat_id" width="-1"/>
-          <column type="field" hidden="0" name="cat_pnom" width="-1"/>
-          <column type="field" hidden="0" name="cat_dnom" width="-1"/>
-          <column type="field" hidden="0" name="epa_type" width="-1"/>
-          <column type="field" hidden="0" name="expl_id" width="-1"/>
-          <column type="field" hidden="0" name="macroexpl_id" width="-1"/>
-          <column type="field" hidden="0" name="sector_id" width="-1"/>
-          <column type="field" hidden="0" name="macrosector_id" width="-1"/>
-          <column type="field" hidden="0" name="arc_id" width="-1"/>
-          <column type="field" hidden="0" name="parent_id" width="-1"/>
-          <column type="field" hidden="0" name="state" width="-1"/>
-          <column type="field" hidden="0" name="state_type" width="-1"/>
-          <column type="field" hidden="0" name="annotation" width="-1"/>
-          <column type="field" hidden="0" name="observ" width="-1"/>
-          <column type="field" hidden="0" name="comment" width="-1"/>
-          <column type="field" hidden="0" name="minsector_id" width="-1"/>
-          <column type="field" hidden="0" name="dma_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodma_id" width="-1"/>
-          <column type="field" hidden="0" name="presszonecat_id" width="-1"/>
-          <column type="field" hidden="0" name="staticpressure" width="-1"/>
-          <column type="field" hidden="0" name="dqa_id" width="-1"/>
-          <column type="field" hidden="0" name="macrodqa_id" width="-1"/>
-          <column type="field" hidden="0" name="soilcat_id" width="-1"/>
-          <column type="field" hidden="0" name="function_type" width="-1"/>
-          <column type="field" hidden="0" name="category_type" width="-1"/>
-          <column type="field" hidden="0" name="fluid_type" width="-1"/>
-          <column type="field" hidden="0" name="location_type" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id" width="-1"/>
-          <column type="field" hidden="0" name="workcat_id_end" width="-1"/>
-          <column type="field" hidden="0" name="builtdate" width="-1"/>
-          <column type="field" hidden="0" name="enddate" width="-1"/>
-          <column type="field" hidden="0" name="buildercat_id" width="-1"/>
-          <column type="field" hidden="0" name="ownercat_id" width="-1"/>
-          <column type="field" hidden="0" name="muni_id" width="-1"/>
-          <column type="field" hidden="0" name="postcode" width="-1"/>
-          <column type="field" hidden="0" name="streetname" width="-1"/>
-          <column type="field" hidden="0" name="postnumber" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement" width="-1"/>
-          <column type="field" hidden="0" name="streetname2" width="-1"/>
-          <column type="field" hidden="0" name="postnumber2" width="-1"/>
-          <column type="field" hidden="0" name="postcomplement2" width="-1"/>
-          <column type="field" hidden="0" name="descript" width="-1"/>
-          <column type="field" hidden="0" name="svg" width="-1"/>
-          <column type="field" hidden="0" name="rotation" width="-1"/>
-          <column type="field" hidden="0" name="link" width="-1"/>
-          <column type="field" hidden="0" name="verified" width="-1"/>
-          <column type="field" hidden="0" name="undelete" width="-1"/>
-          <column type="field" hidden="0" name="label" width="-1"/>
-          <column type="field" hidden="0" name="label_x" width="-1"/>
-          <column type="field" hidden="0" name="label_y" width="-1"/>
-          <column type="field" hidden="0" name="label_rotation" width="-1"/>
-          <column type="field" hidden="0" name="publish" width="-1"/>
-          <column type="field" hidden="0" name="inventory" width="-1"/>
-          <column type="field" hidden="0" name="hemisphere" width="-1"/>
-          <column type="field" hidden="0" name="num_value" width="-1"/>
-          <column type="field" hidden="0" name="nodetype_id" width="-1"/>
-          <column type="field" hidden="0" name="tstamp" width="-1"/>
-          <column type="field" hidden="0" name="insert_user" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate" width="-1"/>
-          <column type="field" hidden="0" name="lastupdate_user" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -89215,7 +88776,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>node_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -89274,7 +88835,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -89298,26 +88859,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -89334,28 +88895,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -89376,22 +88937,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="pol_id"/>
-        <alias index="1" name="" field="connec_id"/>
+        <alias field="pol_id" name="" index="0"/>
+        <alias field="connec_id" name="" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="connec_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="connec_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="connec_id"/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -89399,9 +88960,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="connec_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -89444,7 +89005,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -89503,7 +89064,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -89527,26 +89088,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -89563,28 +89124,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -89605,22 +89166,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="pol_id"/>
-        <alias index="1" name="" field="node_id"/>
+        <alias field="pol_id" name="" index="0"/>
+        <alias field="node_id" name="" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="node_id"/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -89628,9 +89189,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -89673,7 +89234,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" minScale="1500" autoRefreshTime="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyAlgorithm="0" maxScale="0" type="vector" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -89732,7 +89293,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="EPSG:25831" miny="0" dimensions="2" minx="0" maxy="0" minz="0" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -89756,26 +89317,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -89792,28 +89353,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory backgroundAlpha="255" lineSizeType="MM" sizeType="MM" scaleDependency="Area" diagramOrientation="Up" barWidth="5" penWidth="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" height="15" minScaleDenominator="0" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" maxScaleDenominator="1e+08">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" dist="0" priority="0" showAll="1" zIndex="0" placement="1">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <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 type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -89834,22 +89395,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="pol_id"/>
-        <alias index="1" name="" field="node_id"/>
+        <alias field="pol_id" name="" index="0"/>
+        <alias field="node_id" name="" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" field="pol_id" applyOnUpdate="0"/>
-        <default expression="" field="node_id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" unique_strength="1" notnull_strength="1" constraints="3" field="pol_id"/>
-        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="node_id"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="pol_id"/>
-        <constraint desc="" exp="" field="node_id"/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
@@ -89857,9 +89418,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" hidden="0" name="pol_id" width="-1"/>
-          <column type="field" hidden="0" name="node_id" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -89996,21 +89557,20 @@ def my_form_open(dialog, layer, feature):
     <layer id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a"/>
     <layer id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3"/>
     <layer id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e"/>
-    <layer id="ve_config_sysfields_12e68c0a_c816_4ad7_9f00_9ce1b0ec706a"/>
   </layerorder>
   <properties>
     <DBManager>
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -90701,63 +90261,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" units="mm" name="composer_plan" printResolution="300">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" offsetY="0" resolution="10"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="0" background="true" frame="false" type="65638" outlineWidthM="0.3,mm" position="0,0,mm" opacity="1" positionLock="false" size="210,297,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" positionOnPage="0,0,mm" blendMode="0">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -90765,563 +90325,563 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="34" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.5098,248.929,mm" opacity="1" marginX="0" positionLock="false" size="98.6069,5.60773,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" marginY="0" positionOnPage="18.5098,248.929,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
       </LayoutItem>
-      <LayoutItem svgFillColor="255,255,255,255" pictureRotation="0" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" referencePoint="0" visibility="1" excludeFromExports="0" svgBorderColor="0,0,0,255" zValue="34" background="false" northMode="0" frame="false" resizeMode="0" svgBorderWidth="0.2" type="65640" outlineWidthM="0.3,mm" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" position="21.2488,12.0899,mm" opacity="1" mapUuid="" positionLock="false" size="52.9371,8.05991,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" anchorPoint="0" pictureHeight="8.05991" northOffset="0" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" positionOnPage="21.2488,12.0899,mm" blendMode="0" pictureWidth="8.01076">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="33" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.5098,240.85,mm" opacity="1" marginX="0" positionLock="false" size="98.6069,5.60773,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" marginY="0" positionOnPage="18.5098,240.85,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="32" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="130.06,170.278,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" marginY="0" positionOnPage="130.06,170.278,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="31" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.892,162.595,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" marginY="0" positionOnPage="129.892,162.595,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="30" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.892,154.849,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.77795,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" marginY="0" positionOnPage="129.892,154.849,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="29" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.5119,237.417,mm" opacity="1" shapeType="1" positionLock="false" size="107.352,0.232607,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" positionOnPage="18.5119,237.417,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="28" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,170.278,mm" opacity="1" marginX="0" positionLock="false" size="55.7139,5.07458,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total cost of other works:" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" marginY="0" positionOnPage="18.472,170.278,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="27" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.472,180.075,mm" opacity="1" shapeType="1" positionLock="false" size="177.254,0.21446,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" positionOnPage="18.472,180.075,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="26" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.798,191.26,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" marginY="0" positionOnPage="129.798,191.26,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="25" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="129.798,184.169,mm" opacity="1" marginX="0" positionLock="false" size="63.839,4.77795,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" marginY="0" positionOnPage="129.798,184.169,mm" blendMode="0" halign="2" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="24" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.5098,144.841,mm" opacity="1" marginX="0" positionLock="false" size="97.7075,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" marginY="0" positionOnPage="18.5098,144.841,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="23" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,162.595,mm" opacity="1" marginX="0" positionLock="false" size="55.7139,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total cost for node elements:" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" marginY="0" positionOnPage="18.472,162.595,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="22" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.4712,202.127,mm" opacity="1" shapeType="1" positionLock="false" size="178.105,0.232607,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" positionOnPage="18.4712,202.127,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="21" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="18.472,149.994,mm" opacity="1" shapeType="1" positionLock="false" size="177.254,0.21446,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" positionOnPage="18.472,149.994,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="19" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.1613,8.922,mm" opacity="1" shapeType="1" positionLock="false" size="0.851544,16.1039,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" positionOnPage="17.1613,8.922,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="18" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.1613,8.922,mm" opacity="1" shapeType="1" positionLock="false" size="179.415,0.863719,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" positionOnPage="17.1613,8.922,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="17" background="true" labelMargin="0,mm" frame="true" type="65639" outlineWidthM="0.2,mm" followPreset="false" followPresetName="" position="131.014,237.517,mm" opacity="1" positionLock="false" size="65.4621,46.5539,mm" keepLayerSet="true" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" drawCanvasItems="true" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" positionOnPage="131.014,237.517,mm" blendMode="0" mapFlags="0" mapRotation="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="4576100.62452332023531199" xmin="418477.63581281033111736" xmax="419842.63581420265836641" ymax="4577071.35527538601309061"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Node material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres">cat_mat_node20160224165702530</Layer>
-          <Layer name="Arc material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres">cat_mat_arc20160224165702501</Layer>
-          <Layer name="Node catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres">cat_node20151105202206790</Layer>
-          <Layer name="Arc catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres">cat_arc20151120192002466</Layer>
-          <Layer name="Connec catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres">cat_connec20160216122620764</Layer>
-          <Layer name="Element material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres">cat_mat_element20160224165702516</Layer>
-          <Layer name="Element catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres">cat_element20160224165938446</Layer>
-          <Layer name="Owner catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres">cat_owner20160224165938429</Layer>
-          <Layer name="Soil catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres">cat_soil20151105202206837</Layer>
-          <Layer name="Pavement catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres">cat_pavement20170111155456255</Layer>
-          <Layer name="Work catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres">cat_work20160216122620842</Layer>
-          <Layer name="Builder catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres">cat_builder20160216122620733</Layer>
-          <Layer name="Brand model catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres">cat_brand_model20180131084332427</Layer>
-          <Layer name="Brand catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres">cat_brand20180131084235586</Layer>
-          <Layer name="Users catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres">cat_users20180131084332505</Layer>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres" name="Node material catalog">cat_mat_node20160224165702530</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres" name="Arc material catalog">cat_mat_arc20160224165702501</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres" name="Node catalog">cat_node20151105202206790</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres" name="Arc catalog">cat_arc20151120192002466</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres" name="Connec catalog">cat_connec20160216122620764</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres" name="Element material catalog">cat_mat_element20160224165702516</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres" name="Element catalog">cat_element20160224165938446</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres" name="Owner catalog">cat_owner20160224165938429</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres" name="Soil catalog">cat_soil20151105202206837</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres" name="Pavement catalog">cat_pavement20170111155456255</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres" name="Work catalog">cat_work20160216122620842</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres" name="Builder catalog">cat_builder20160216122620733</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres" name="Brand model catalog">cat_brand_model20180131084332427</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres" name="Brand catalog">cat_brand20180131084235586</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres" name="Users catalog">cat_users20180131084332505</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle layerid="cat_arc20151120192002466" name="Arc catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="-4.65661e-10" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_arc&quot; sql=" provider="postgres" name="Arc catalog" layerid="cat_arc20151120192002466">
+            <qgis readOnly="0" version="2.18.14" minimumScale="-4.65661e-10" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="arctype_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="arc_type20151120180544344" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="arc_type20151120180544344" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_arc20160224165702501" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_arc20160224165702501" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="pnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dint">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dext">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="z1">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="z2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="width">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="area">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="estimated_depth">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="bulk">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_unit">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m2bottom_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3protec_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="arctype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="pnom"/>
-                <alias index="4" name="" field="dnom"/>
-                <alias index="5" name="" field="dint"/>
-                <alias index="6" name="" field="dext"/>
-                <alias index="7" name="" field="descript"/>
-                <alias index="8" name="" field="link"/>
-                <alias index="9" name="" field="brand"/>
-                <alias index="10" name="" field="model"/>
-                <alias index="11" name="" field="svg"/>
-                <alias index="12" name="" field="z1"/>
-                <alias index="13" name="" field="z2"/>
-                <alias index="14" name="" field="width"/>
-                <alias index="15" name="" field="area"/>
-                <alias index="16" name="" field="estimated_depth"/>
-                <alias index="17" name="" field="bulk"/>
-                <alias index="18" name="" field="cost_unit"/>
-                <alias index="19" name="" field="cost"/>
-                <alias index="20" name="" field="m2bottom_cost"/>
-                <alias index="21" name="" field="m3protec_cost"/>
-                <alias index="22" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="arctype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="pnom" index="3"/>
+                <alias name="" field="dnom" index="4"/>
+                <alias name="" field="dint" index="5"/>
+                <alias name="" field="dext" index="6"/>
+                <alias name="" field="descript" index="7"/>
+                <alias name="" field="link" index="8"/>
+                <alias name="" field="brand" index="9"/>
+                <alias name="" field="model" index="10"/>
+                <alias name="" field="svg" index="11"/>
+                <alias name="" field="z1" index="12"/>
+                <alias name="" field="z2" index="13"/>
+                <alias name="" field="width" index="14"/>
+                <alias name="" field="area" index="15"/>
+                <alias name="" field="estimated_depth" index="16"/>
+                <alias name="" field="bulk" index="17"/>
+                <alias name="" field="cost_unit" index="18"/>
+                <alias name="" field="cost" index="19"/>
+                <alias name="" field="m2bottom_cost" index="20"/>
+                <alias name="" field="m3protec_cost" index="21"/>
+                <alias name="" field="active" index="22"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_arc20151120192002466',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="arctype_id" width="-1"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="pnom" width="-1"/>
-                  <column type="field" hidden="0" name="dnom" width="-1"/>
-                  <column type="field" hidden="0" name="dint" width="-1"/>
-                  <column type="field" hidden="0" name="dext" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="159"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="148"/>
-                  <column type="field" hidden="0" name="z1" width="-1"/>
-                  <column type="field" hidden="0" name="z2" width="-1"/>
-                  <column type="field" hidden="0" name="width" width="-1"/>
-                  <column type="field" hidden="0" name="area" width="-1"/>
-                  <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-                  <column type="field" hidden="0" name="bulk" width="-1"/>
-                  <column type="field" hidden="0" name="cost_unit" width="-1"/>
-                  <column type="field" hidden="0" name="cost" width="-1"/>
-                  <column type="field" hidden="0" name="m2bottom_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m3protec_cost" width="-1"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="arctype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="pnom"/>
+                  <column type="field" width="-1" hidden="0" name="dnom"/>
+                  <column type="field" width="-1" hidden="0" name="dint"/>
+                  <column type="field" width="-1" hidden="0" name="dext"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="159" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="148" hidden="0" name="svg"/>
+                  <column type="field" width="-1" hidden="0" name="z1"/>
+                  <column type="field" width="-1" hidden="0" name="z2"/>
+                  <column type="field" width="-1" hidden="0" name="width"/>
+                  <column type="field" width="-1" hidden="0" name="area"/>
+                  <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+                  <column type="field" width="-1" hidden="0" name="bulk"/>
+                  <column type="field" width="-1" hidden="0" name="cost_unit"/>
+                  <column type="field" width="-1" hidden="0" name="cost"/>
+                  <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91381,34 +90941,34 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_brand20180131084235586" name="Brand catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand&quot; sql=" provider="postgres" name="Brand catalog" layerid="cat_brand20180131084235586">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>.</editform>
@@ -91432,39 +90992,39 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_brand_model20180131084332427" name="Brand model catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_brand_model&quot; sql=" provider="postgres" name="Brand model catalog" layerid="cat_brand_model20180131084332427">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="catbrand_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="catbrand_id"/>
-                <alias index="2" name="" field="descript"/>
-                <alias index="3" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="catbrand_id" index="1"/>
+                <alias name="" field="descript" index="2"/>
+                <alias name="" field="link" index="3"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="catbrand_id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="catbrand_id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>.</editform>
@@ -91489,36 +91049,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_builder20160216122620733" name="Builder catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_builder&quot; sql=" provider="postgres" name="Builder catalog" layerid="cat_builder20160216122620733">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_builder20160216122620733',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91542,101 +91102,101 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_connec20160216122620764" name="Connec catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_connec&quot; sql=" provider="postgres" name="Connec catalog" layerid="cat_connec20160216122620764">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="connectype_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_arc20160224165702501" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_arc20160224165702501" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="pnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dint">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dext">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_ut">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_ml">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost_m3">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="connectype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="pnom"/>
-                <alias index="4" name="" field="dnom"/>
-                <alias index="5" name="" field="dint"/>
-                <alias index="6" name="" field="dext"/>
-                <alias index="7" name="" field="descript"/>
-                <alias index="8" name="" field="link"/>
-                <alias index="9" name="" field="brand"/>
-                <alias index="10" name="" field="model"/>
-                <alias index="11" name="" field="svg"/>
-                <alias index="12" name="" field="cost_ut"/>
-                <alias index="13" name="" field="cost_ml"/>
-                <alias index="14" name="" field="cost_m3"/>
-                <alias index="15" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="connectype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="pnom" index="3"/>
+                <alias name="" field="dnom" index="4"/>
+                <alias name="" field="dint" index="5"/>
+                <alias name="" field="dext" index="6"/>
+                <alias name="" field="descript" index="7"/>
+                <alias name="" field="link" index="8"/>
+                <alias name="" field="brand" index="9"/>
+                <alias name="" field="model" index="10"/>
+                <alias name="" field="svg" index="11"/>
+                <alias name="" field="cost_ut" index="12"/>
+                <alias name="" field="cost_ml" index="13"/>
+                <alias name="" field="cost_m3" index="14"/>
+                <alias name="" field="active" index="15"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_connec20160216122620764',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="132"/>
-                  <column type="field" hidden="0" name="connectype_id" width="-1"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="pnom" width="-1"/>
-                  <column type="field" hidden="0" name="dnom" width="-1"/>
-                  <column type="field" hidden="0" name="dint" width="-1"/>
-                  <column type="field" hidden="0" name="dext" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="-1"/>
-                  <column type="field" hidden="0" name="cost_ut" width="140"/>
-                  <column type="field" hidden="0" name="cost_ml" width="-1"/>
-                  <column type="field" hidden="0" name="cost_m3" width="-1"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="132" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="connectype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="pnom"/>
+                  <column type="field" width="-1" hidden="0" name="dnom"/>
+                  <column type="field" width="-1" hidden="0" name="dint"/>
+                  <column type="field" width="-1" hidden="0" name="dext"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="-1" hidden="0" name="svg"/>
+                  <column type="field" width="140" hidden="0" name="cost_ut"/>
+                  <column type="field" width="-1" hidden="0" name="cost_ml"/>
+                  <column type="field" width="-1" hidden="0" name="cost_m3"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91689,76 +91249,76 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_element20160224165938446" name="Element catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_element&quot; sql=" provider="postgres" name="Element catalog" layerid="cat_element20160224165938446">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="elementtype_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="element_type20160224171001597" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="element_type20160224171001597" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_element20160224165702516" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_element20160224165702516" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="geometry">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="type">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="elementtype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="geometry"/>
-                <alias index="4" name="" field="descript"/>
-                <alias index="5" name="" field="link"/>
-                <alias index="6" name="" field="brand"/>
-                <alias index="7" name="" field="type"/>
-                <alias index="8" name="" field="model"/>
-                <alias index="9" name="" field="svg"/>
-                <alias index="10" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="elementtype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="geometry" index="3"/>
+                <alias name="" field="descript" index="4"/>
+                <alias name="" field="link" index="5"/>
+                <alias name="" field="brand" index="6"/>
+                <alias name="" field="type" index="7"/>
+                <alias name="" field="model" index="8"/>
+                <alias name="" field="svg" index="9"/>
+                <alias name="" field="active" index="10"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_element20160224165938446',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="elementtype_id" width="-1"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="geometry" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="type" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="-1"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="geometry"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="type"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="-1" hidden="0" name="svg"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91790,36 +91350,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_mat_arc20160224165702501" name="Arc material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_arc&quot; sql=" provider="postgres" name="Arc material catalog" layerid="cat_mat_arc20160224165702501">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_arc20160224165702501',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91843,36 +91403,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_mat_element20160224165702516" name="Element material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_element&quot; sql=" provider="postgres" name="Element material catalog" layerid="cat_mat_element20160224165702516">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_element20160224165702516',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="167"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="167" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91896,36 +91456,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_mat_node20160224165702530" name="Node material catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_mat_node&quot; sql=" provider="postgres" name="Node material catalog" layerid="cat_mat_node20160224165702530">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_mat_node20160224165702530',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -91949,106 +91509,106 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_node20151105202206790" name="Node catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_node&quot; sql=" provider="postgres" name="Node catalog" layerid="cat_node20151105202206790">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="nodetype_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="node_type20151120182614953" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="node_type20151120182614953" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="matcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_mat_node20160224165702530" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_mat_node20160224165702530" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="pnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dnom">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dint">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="dext">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="shape">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="brand">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="model">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="svg">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="estimated_depth">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="cost_unit">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="price_value_unit20160710014513523" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="price_value_unit20160710014513523" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="active">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="nodetype_id"/>
-                <alias index="2" name="" field="matcat_id"/>
-                <alias index="3" name="" field="pnom"/>
-                <alias index="4" name="" field="dnom"/>
-                <alias index="5" name="" field="dint"/>
-                <alias index="6" name="" field="dext"/>
-                <alias index="7" name="" field="shape"/>
-                <alias index="8" name="" field="descript"/>
-                <alias index="9" name="" field="link"/>
-                <alias index="10" name="" field="brand"/>
-                <alias index="11" name="" field="model"/>
-                <alias index="12" name="" field="svg"/>
-                <alias index="13" name="" field="estimated_depth"/>
-                <alias index="14" name="" field="cost_unit"/>
-                <alias index="15" name="" field="cost"/>
-                <alias index="16" name="" field="active"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="nodetype_id" index="1"/>
+                <alias name="" field="matcat_id" index="2"/>
+                <alias name="" field="pnom" index="3"/>
+                <alias name="" field="dnom" index="4"/>
+                <alias name="" field="dint" index="5"/>
+                <alias name="" field="dext" index="6"/>
+                <alias name="" field="shape" index="7"/>
+                <alias name="" field="descript" index="8"/>
+                <alias name="" field="link" index="9"/>
+                <alias name="" field="brand" index="10"/>
+                <alias name="" field="model" index="11"/>
+                <alias name="" field="svg" index="12"/>
+                <alias name="" field="estimated_depth" index="13"/>
+                <alias name="" field="cost_unit" index="14"/>
+                <alias name="" field="cost" index="15"/>
+                <alias name="" field="active" index="16"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_node20151105202206790',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="&quot;cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="129"/>
-                  <column type="field" hidden="0" name="nodetype_id" width="115"/>
-                  <column type="field" hidden="0" name="matcat_id" width="-1"/>
-                  <column type="field" hidden="0" name="pnom" width="-1"/>
-                  <column type="field" hidden="0" name="dnom" width="-1"/>
-                  <column type="field" hidden="0" name="dint" width="-1"/>
-                  <column type="field" hidden="0" name="dext" width="-1"/>
-                  <column type="field" hidden="0" name="shape" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="104"/>
-                  <column type="field" hidden="0" name="brand" width="-1"/>
-                  <column type="field" hidden="0" name="model" width="-1"/>
-                  <column type="field" hidden="0" name="svg" width="115"/>
-                  <column type="field" hidden="0" name="estimated_depth" width="-1"/>
-                  <column type="field" hidden="0" name="cost_unit" width="-1"/>
-                  <column type="field" hidden="0" name="cost" width="156"/>
-                  <column type="field" hidden="0" name="active" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="129" hidden="0" name="id"/>
+                  <column type="field" width="115" hidden="0" name="nodetype_id"/>
+                  <column type="field" width="-1" hidden="0" name="matcat_id"/>
+                  <column type="field" width="-1" hidden="0" name="pnom"/>
+                  <column type="field" width="-1" hidden="0" name="dnom"/>
+                  <column type="field" width="-1" hidden="0" name="dint"/>
+                  <column type="field" width="-1" hidden="0" name="dext"/>
+                  <column type="field" width="-1" hidden="0" name="shape"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="104" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="brand"/>
+                  <column type="field" width="-1" hidden="0" name="model"/>
+                  <column type="field" width="115" hidden="0" name="svg"/>
+                  <column type="field" width="-1" hidden="0" name="estimated_depth"/>
+                  <column type="field" width="-1" hidden="0" name="cost_unit"/>
+                  <column type="field" width="156" hidden="0" name="cost"/>
+                  <column type="field" width="-1" hidden="0" name="active"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -92102,36 +91662,36 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_owner20160224165938429" name="Owner catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_owner&quot; sql=" provider="postgres" name="Owner catalog" layerid="cat_owner20160224165938429">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_owner20160224165938429',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -92155,44 +91715,44 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_pavement20170111155456255" name="Pavement catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_pavement&quot; sql=" provider="postgres" name="Pavement catalog" layerid="cat_pavement20170111155456255">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="thickness">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m2_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
-                <alias index="3" name="" field="thickness"/>
-                <alias index="4" name="" field="m2_cost"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
+                <alias name="" field="thickness" index="3"/>
+                <alias name="" field="m2_cost" index="4"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="thickness" width="-1"/>
-                  <column type="field" hidden="0" name="m2_cost" width="121"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="thickness"/>
+                  <column type="field" width="121" hidden="0" name="m2_cost"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -92218,71 +91778,71 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_soil20151105202206837" name="Soil catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_soil&quot; sql=" provider="postgres" name="Soil catalog" layerid="cat_soil20151105202206837">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_param">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="b">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="trenchlining">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3exc_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3fill_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m3excess_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="m2trenchl_cost">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
-                <alias index="3" name="" field="y_param"/>
-                <alias index="4" name="" field="b"/>
-                <alias index="5" name="" field="trenchlining"/>
-                <alias index="6" name="" field="m3exc_cost"/>
-                <alias index="7" name="" field="m3fill_cost"/>
-                <alias index="8" name="" field="m3excess_cost"/>
-                <alias index="9" name="" field="m2trenchl_cost"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
+                <alias name="" field="y_param" index="3"/>
+                <alias name="" field="b" index="4"/>
+                <alias name="" field="trenchlining" index="5"/>
+                <alias name="" field="m3exc_cost" index="6"/>
+                <alias name="" field="m3fill_cost" index="7"/>
+                <alias name="" field="m3excess_cost" index="8"/>
+                <alias name="" field="m2trenchl_cost" index="9"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_soil20151105202206837',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="&quot;m3fill_cost&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="194"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="y_param" width="-1"/>
-                  <column type="field" hidden="0" name="b" width="-1"/>
-                  <column type="field" hidden="0" name="trenchlining" width="-1"/>
-                  <column type="field" hidden="0" name="m3exc_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m3fill_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m3excess_cost" width="-1"/>
-                  <column type="field" hidden="0" name="m2trenchl_cost" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="194" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="y_param"/>
+                  <column type="field" width="-1" hidden="0" name="b"/>
+                  <column type="field" width="-1" hidden="0" name="trenchlining"/>
+                  <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+                  <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -92313,34 +91873,34 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_users20180131084332505" name="Users catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_users&quot; sql=" provider="postgres" name="Users catalog" layerid="cat_users20180131084332505">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="context">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="name"/>
-                <alias index="2" name="" field="context"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="context" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="name" width="-1"/>
-                  <column type="field" hidden="0" name="context" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="context"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>.</editform>
@@ -92364,51 +91924,51 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="cat_work20160216122620842" name="Work catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres">
-            <qgis readOnly="0" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" maximumScale="1e+08">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;cat_work&quot; sql=" provider="postgres" name="Work catalog" layerid="cat_work20160216122620842">
+            <qgis readOnly="0" version="2.18.14" minimumScale="0" hasScaleBasedVisibilityFlag="0" maximumScale="1e+08">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="descript">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="link">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="workid_key1">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="workid_key2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="0" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="0" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="builtdate">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="descript"/>
-                <alias index="2" name="" field="link"/>
-                <alias index="3" name="" field="workid_key1"/>
-                <alias index="4" name="" field="workid_key2"/>
-                <alias index="5" name="" field="builtdate"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="descript" index="1"/>
+                <alias name="" field="link" index="2"/>
+                <alias name="" field="workid_key1" index="3"/>
+                <alias name="" field="workid_key2" index="4"/>
+                <alias name="" field="builtdate" index="5"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="0">
-                <actionsetting type="1" showInAttributeTable="1" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" shortTitle="" name="History aSCHEMA_NAMEit" icon="" capture="0"/>
+                <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('cat_work20160216122620842',[% $id %])" capture="0" type="1" showInAttributeTable="1" icon="" shortTitle="" name="History aSCHEMA_NAMEit"/>
               </attributeactions>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="descript" width="-1"/>
-                  <column type="field" hidden="0" name="link" width="-1"/>
-                  <column type="field" hidden="0" name="workid_key1" width="-1"/>
-                  <column type="field" hidden="0" name="workid_key2" width="-1"/>
-                  <column type="field" hidden="0" name="builtdate" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="descript"/>
+                  <column type="field" width="-1" hidden="0" name="link"/>
+                  <column type="field" width="-1" hidden="0" name="workid_key1"/>
+                  <column type="field" width="-1" hidden="0" name="workid_key2"/>
+                  <column type="field" width="-1" hidden="0" name="builtdate"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -92451,34 +92011,34 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>4</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="ext_municipality20171204170633784" name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleFill" pass="0" locked="0">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleFill">
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -92635,69 +92195,69 @@ def my_form_open(dialog, layer, feature):
               <displayfield>name</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="-1" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="muni_id"/>
-                <alias index="1" name="" field="name"/>
-                <alias index="2" name="" field="observ"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="muni_id" width="-1"/>
-                  <column type="field" hidden="0" name="name" width="183"/>
-                  <column type="field" hidden="0" name="observ" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -92737,434 +92297,434 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_edit_dimensions20170628134034849" name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" symbol="0" scalemindenom="1" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 "/>
-                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" symbol="1" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2"/>
-                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" symbol="2" scalemindenom="600" scalemaxdenom="1600"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol type="line" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleLine" pass="0" locked="0">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleLine">
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@1">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@2">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@3">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol type="line" clip_to_extent="1" alpha="1" name="1">
-                    <layer class="SimpleLine" pass="0" locked="0">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleLine">
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@1@1">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@1@2">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@1@3">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol type="line" clip_to_extent="1" alpha="1" name="2">
-                    <layer class="SimpleLine" pass="0" locked="0">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleLine">
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
-                    <layer class="GeometryGenerator" pass="0" locked="0">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol type="line" clip_to_extent="1" alpha="1" name="@2@1">
-                        <layer class="SimpleLine" pass="0" locked="0">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <layer locked="0" pass="0" class="GeometryGenerator">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleLine">
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="MarkerLine" pass="0" locked="0">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol type="marker" clip_to_extent="1" alpha="1" name="@2@2">
-                        <layer class="SimpleMarker" pass="0" locked="0">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="MarkerLine">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleMarker">
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="GeometryGenerator" pass="0" locked="0">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol type="fill" clip_to_extent="1" alpha="1" name="@2@3">
-                        <layer class="SimpleFill" pass="0" locked="0">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                    <layer locked="0" pass="0" class="GeometryGenerator">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleFill">
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
-                    <layer class="GeometryGenerator" pass="0" locked="0">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol type="line" clip_to_extent="1" alpha="1" name="@2@4">
-                        <layer class="SimpleLine" pass="0" locked="0">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <layer locked="0" pass="0" class="GeometryGenerator">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
+                        <layer locked="0" pass="0" class="SimpleLine">
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -93173,143 +92733,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="0" fontFamily="Calibri Light" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="8.25" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="2" repeatDistanceUnit="2" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="1" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" active="true" useExpr="false" field="x_label"/>
-                        <PositionY expr="&quot;y_label&quot; -1" active="true" useExpr="false" field="y_label"/>
-                        <Rotation expr="" active="true" useExpr="false" field="rotation_label"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style fontStrikeout="0" fontLetterSpacing="0" textTransp="0" fontSizeMapUnitScale="0,0,0,0,0,0" textColor="0,0,0,255" isExpression="1" fontCapitals="0" fontSizeInMapUnits="1" fontFamily="Calibri Light" fieldName="'-' || '&amp;' || '()'" previewBkgrdColor="#ffffff" useSubstitutions="0" fontWeight="25" fontItalic="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontSize="2.3" namedStyle="Light">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format multilineHeight="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" placeDirectionSymbol="0" addDirectionSymbol="0" formatNumbers="0" plussign="0" decimals="3" wrapChar="&amp;" multilineAlign="1" reverseDirectionSymbol="0"/>
-                      <text-buffer bufferNoFill="0" bufferSizeInMapUnits="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferDraw="0" bufferSize="1" bufferTransp="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
-                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeDraw="0" shapeBlendMode="0" shapeSizeType="0" shapeSizeY="0" shapeTransparency="0" shapeBorderWidth="0" shapeSizeX="0" shapeBorderWidthUnits="1" shapeRadiiY="0" shapeRotation="0" shapeFillColor="255,255,255,255" shapeType="0" shapeJoinStyle="64" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeRadiiUnits="1" shapeOffsetY="0" shapeSVGFile="" shapeSizeUnits="1" shapeRotationType="0" shapeRadiiX="0" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0"/>
-                      <shadow shadowScale="100" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetUnits="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowTransparency="30" shadowRadiusAlphaOnly="0" shadowRadiusUnits="1"/>
-                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" placement="4" repeatDistanceUnit="1" offsetType="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" angleOffset="0" centroidInside="0" repeatDistance="0" labelOffsetInMapUnits="1" quadOffset="4" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" priority="5" xOffset="0" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" yOffset="0" distInMapUnits="0" placementFlags="10" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering obstacle="1" maxNumLabels="2000" obstacleType="0" upsidedownLabels="0" obstacleFactor="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" scaleMin="1" limitNumLabels="0" labelPerPart="0" displayAll="0" scaleMax="10000000" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" fontMaxPixelSize="10000"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" useExpr="true" field="x_symbol"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" useExpr="true" field="y_symbol"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -93466,91 +93026,91 @@ def my_form_open(dialog, layer, feature):
               <displayfield>id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Etiqueta" fieldname=""/>
+                <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="0" zIndex="0" placement="2"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="distance"/>
-                <alias index="2" name="" field="depth"/>
-                <alias index="3" name="" field="x_label"/>
-                <alias index="4" name="" field="y_label"/>
-                <alias index="5" name="" field="rotation_label"/>
-                <alias index="6" name="" field="offset_label"/>
-                <alias index="7" name="" field="direction_arrow"/>
-                <alias index="8" name="" field="x_symbol"/>
-                <alias index="9" name="" field="y_symbol"/>
-                <alias index="10" name="" field="feature_id"/>
-                <alias index="11" name="" field="feature_type"/>
-                <alias index="12" name="" field="state"/>
-                <alias index="13" name="" field="expl_id"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="distance" width="-1"/>
-                  <column type="field" hidden="0" name="depth" width="-1"/>
-                  <column type="field" hidden="0" name="x_label" width="-1"/>
-                  <column type="field" hidden="0" name="y_label" width="-1"/>
-                  <column type="field" hidden="0" name="rotation_label" width="-1"/>
-                  <column type="field" hidden="0" name="offset_label" width="-1"/>
-                  <column type="field" hidden="0" name="direction_arrow" width="-1"/>
-                  <column type="field" hidden="0" name="x_symbol" width="-1"/>
-                  <column type="field" hidden="0" name="y_symbol" width="-1"/>
-                  <column type="field" hidden="0" name="feature_id" width="-1"/>
-                  <column type="field" hidden="0" name="feature_type" width="-1"/>
-                  <column type="field" hidden="0" name="state" width="-1"/>
-                  <column type="field" hidden="0" name="expl_id" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -93601,132 +93161,132 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_edit_samplepoint20170619120830016" name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="0" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" version="2.18.14" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="dma_id" Layer="v_edit_dma20180201085045064" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="id" Layer="value_state20160216123517266" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config display_format="yyyy-MM-dd" allow_null="1" constraintDescription="" labelOnTop="0" calendar_popup="1" fieldEditable="1" notNull="0" constraint="" field_format="yyyy-MM-dd"/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config display_format="yyyy-MM-dd" allow_null="1" constraintDescription="" labelOnTop="0" calendar_popup="1" fieldEditable="1" notNull="0" constraint="" field_format="yyyy-MM-dd"/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_work20160216122620842" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="cat_work20160216122620842" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="muni_id" Layer="ext_municipality20171204170633784" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="id" Layer="ext_streetaxis20160528211138508" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraintDescription="" Value="postnumber" labelOnTop="0" Key="postnumber" Layer="ext_address20171204171433160" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraintDescription="" Value="id" labelOnTop="0" Key="id" Layer="value_verified20160216164517266" UseCompleter="0" OrderByValue="0" AllowNull="0" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraintDescription="" Value="name" labelOnTop="0" Key="expl_id" Layer="exploitation20180122152954062" UseCompleter="0" OrderByValue="0" AllowNull="1" fieldEditable="1" notNull="0" constraint="" AllowMulti="0" FilterExpression=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="marker" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleMarker" pass="0" locked="0">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleMarker">
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
-                    <layer class="FontMarker" pass="0" locked="0">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                    <layer locked="0" pass="0" class="FontMarker">
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -93883,83 +93443,83 @@ def my_form_open(dialog, layer, feature):
               <displayfield>sample_id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer upperHeight="50" lowerHeight="0" upperWidth="50" diagramType="Histogram" classificationAttributeExpression="" upperValue="0" attributeLegend="1" sizeLegend="0" lowerValue="0" lowerWidth="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="100000" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="0" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="sample_id"/>
-                <alias index="1" name="" field="code"/>
-                <alias index="2" name="" field="lab_code"/>
-                <alias index="3" name="" field="feature_id"/>
-                <alias index="4" name="" field="featurecat_id"/>
-                <alias index="5" name="" field="dma_id"/>
-                <alias index="6" name="" field="macrodma_id"/>
-                <alias index="7" name="" field="presszonecat_id"/>
-                <alias index="8" name="" field="state"/>
-                <alias index="9" name="" field="builtdate"/>
-                <alias index="10" name="" field="enddate"/>
-                <alias index="11" name="" field="workcat_id"/>
-                <alias index="12" name="" field="workcat_id_end"/>
-                <alias index="13" name="" field="rotation"/>
-                <alias index="14" name="" field="muni_id"/>
-                <alias index="15" name="" field="streetaxis_id"/>
-                <alias index="16" name="" field="postnumber"/>
-                <alias index="17" name="" field="postcode"/>
-                <alias index="18" name="" field="streetaxis2_id"/>
-                <alias index="19" name="" field="postnumber2"/>
-                <alias index="20" name="" field="postcomplement"/>
-                <alias index="21" name="" field="postcomplement2"/>
-                <alias index="22" name="" field="place_name"/>
-                <alias index="23" name="" field="cabinet"/>
-                <alias index="24" name="" field="observations"/>
-                <alias index="25" name="" field="verified"/>
-                <alias index="26" name="" field="expl_id"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
@@ -94028,53 +93588,53 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_ext_address20180201103159332" name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="0" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="marker" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleMarker" pass="0" locked="0">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleMarker">
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -94230,77 +93790,77 @@ def my_form_open(dialog, layer, feature):
               <displayfield>id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="-1" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="muni_id"/>
-                <alias index="2" name="" field="postcode"/>
-                <alias index="3" name="" field="streetaxis_id"/>
-                <alias index="4" name="" field="postnumber"/>
-                <alias index="5" name="" field="plot_id"/>
-                <alias index="6" name="" field="expl_id"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
               <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column type="field" hidden="0" name="id" width="-1"/>
-                  <column type="field" hidden="0" name="muni_id" width="-1"/>
-                  <column type="field" hidden="0" name="postcode" width="-1"/>
-                  <column type="field" hidden="0" name="streetaxis_id" width="-1"/>
-                  <column type="field" hidden="0" name="postnumber" width="-1"/>
-                  <column type="field" hidden="0" name="plot_id" width="-1"/>
-                  <column type="field" hidden="0" name="expl_id" width="-1"/>
-                  <column type="actions" hidden="1" width="-1"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -94344,61 +93904,61 @@ def my_form_open(dialog, layer, feature):
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle layerid="v_ext_plot20180201103159443" name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">
-            <qgis simplifyDrawingHints="1" maxLabelScale="1e+08" simplifyLocal="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="2.18.14" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraintDescription="" labelOnTop="0" UseHtml="0" fieldEditable="1" notNull="0" constraint="" IsMultiline="0"/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                    <layer class="SimpleFill" pass="0" locked="0">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
+                    <layer locked="0" pass="0" class="SimpleFill">
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -94554,68 +94114,68 @@ def my_form_open(dialog, layer, feature):
               <displayfield>id</displayfield>
               <label>0</label>
               <labelattributes>
-                <label text="Label" fieldname=""/>
+                <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
-                <size units="pt" value="12" fieldname=""/>
+                <size fieldname="" units="pt" value="12"/>
                 <bold on="0" fieldname=""/>
                 <italic on="0" fieldname=""/>
                 <underline on="0" fieldname=""/>
                 <strikeout on="0" fieldname=""/>
-                <color blue="0" green="0" fieldname="" red="0"/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-                <angle value="0" fieldname="" auto="0"/>
-                <alignment value="center" fieldname=""/>
-                <buffercolor blue="255" green="255" fieldname="" red="255"/>
-                <buffersize units="pt" value="1" fieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
+                <angle fieldname="" auto="0" value="0"/>
+                <alignment fieldname="" value="center"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
+                <buffersize fieldname="" units="pt" value="1"/>
                 <bufferenabled on="" fieldname=""/>
                 <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1" sizeLegend="0">
-                <DiagramCategory backgroundAlpha="255" lineSizeType="MM" scaleDependency="Area" sizeType="MM" diagramOrientation="Up" barWidth="5" angleOffset="1440" penWidth="0" sizeScale="0,0,0,0,0,0" scaleBasedVisibility="0" lineSizeScale="0,0,0,0,0,0" height="15" minScaleDenominator="inf" width="15" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penAlpha="255" penColor="#000000" enabled="0" minimumSize="0" transparency="0" maxScaleDenominator="1e+08">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                  <layer class="SimpleMarker" pass="0" locked="0">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
+                  <layer locked="0" pass="0" class="SimpleMarker">
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings obstacle="0" linePlacementFlags="10" dist="0" xPosColumn="-1" priority="0" showAll="1" yPosColumn="-1" showColumn="0" zIndex="0" placement="0"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias index="0" name="" field="id"/>
-                <alias index="1" name="" field="plot_code"/>
-                <alias index="2" name="" field="muni_id"/>
-                <alias index="3" name="" field="postcode"/>
-                <alias index="4" name="" field="streetaxis_id"/>
-                <alias index="5" name="" field="postnumber"/>
-                <alias index="6" name="" field="complement"/>
-                <alias index="7" name="" field="placement"/>
-                <alias index="8" name="" field="square"/>
-                <alias index="9" name="" field="observ"/>
-                <alias index="10" name="" field="text"/>
-                <alias index="11" name="" field="expl_id"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
@@ -94670,98 +94230,98 @@ def my_form_open(dialog, layer, feature):
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid maximumIntervalWidth="100" rightAnnotationDisplay="0" unit="0" gridFrameStyle="0" offsetX="0" intervalY="0" bottomAnnotationDirection="0" annotationPrecision="3" bottomAnnotationPosition="1" name="Cuadr�cula 1" annotationFormat="0" bottomFrameDivisions="0" frameFillColor1="255,255,255,255" rightFrameDivisions="0" bottomAnnotationDisplay="0" leftFrameDivisions="0" gridFrameMargin="0" intervalX="0" topAnnotationDirection="0" topAnnotationPosition="1" show="0" crossLength="3" minimumIntervalWidth="50" rightAnnotationPosition="1" annotationExpression="" gridFrameSideFlags="15" position="3" leftAnnotationPosition="1" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" showAnnotation="0" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFrameWidth="2" offsetY="0" blendMode="0" frameAnnotationDistance="1" gridStyle="0" annotationFontColor="0,0,0,255" frameFillColor2="0,0,0,255" gridFramePenThickness="0.5" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" topFrameDivisions="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" centered="0" inverted="0" position="3" show="1" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" name="Vista general 1" blendMode="0">
-          <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -94769,610 +94329,610 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="16" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.1613,22.2695,mm" opacity="1" shapeType="1" positionLock="false" size="179.415,2.75637,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{04100234-7357-49e1-9d15-b7949d417719}" positionOnPage="17.1613,22.2695,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="15" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="40.013,223.173,mm" opacity="1" marginX="1" positionLock="false" size="149.138,11.1067,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% &quot;observ&quot; %]" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" marginY="1" positionOnPage="40.013,223.173,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="14" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="37.635,212.191,mm" opacity="1" marginX="1" positionLock="false" size="153.454,10.5555,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="[% &quot;descript&quot; %]" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" marginY="1" positionOnPage="37.635,212.191,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="13" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,191.26,mm" opacity="1" marginX="0" positionLock="false" size="77.862,4.52331,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" marginY="0" positionOnPage="18.472,191.26,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="12" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.2394,224.173,mm" opacity="1" marginX="0" positionLock="false" size="24.3323,3.60837,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Observations:" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" marginY="0" positionOnPage="18.2394,224.173,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="11" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,184.169,mm" opacity="1" marginX="0" positionLock="false" size="63.839,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" marginY="0" positionOnPage="18.472,184.169,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem svgFillColor="0,0,0,255" pictureRotation="90" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" referencePoint="0" visibility="1" excludeFromExports="0" svgBorderColor="255,255,255,255" zValue="10" background="true" northMode="0" frame="false" resizeMode="0" svgBorderWidth="0" type="65640" outlineWidthM="0.3,mm" file="arrows/NorthArrow_10.svg" position="186.801,128.951,mm" opacity="1" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" positionLock="false" size="6.83615,6.83615,mm" groupUuid="" id="compass" itemRotation="0" frameJoinStyle="miter" anchorPoint="0" pictureHeight="6.83615" northOffset="0" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" positionOnPage="186.801,128.951,mm" blendMode="0" pictureWidth="5.27855">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="128" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="9" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.472,154.849,mm" opacity="1" marginX="0" positionLock="false" size="53.284,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Total cost for arc elements:" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" marginY="0" positionOnPage="18.472,154.849,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="8" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.4712,213.104,mm" opacity="1" marginX="0" positionLock="false" size="20.5677,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Description:" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" marginY="0" positionOnPage="18.4712,213.104,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="7" background="false" frame="false" type="65641" outlineWidthM="0.3,mm" position="18.4712,206.23,mm" opacity="1" marginX="0" positionLock="false" size="96.1108,5.87319,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="Priority:  [% &quot;priority&quot; %]" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" marginY="0" positionOnPage="18.4712,206.23,mm" blendMode="0" halign="1" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="6" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.603,287.775,mm" opacity="1" shapeType="1" positionLock="false" size="179.614,0.746,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" positionOnPage="17.603,287.775,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" referencePoint="0" visibility="1" excludeFromExports="0" sectionY="0" zValue="5" background="false" frame="false" type="65647" outlineWidthM="0.3,mm" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" hideBackgroundIfEmpty="0" position="62.9048,188.347,mm" opacity="1" positionLock="false" size="44,6.16796,mm" groupUuid="" hidePageIfEmpty="0" id="" itemRotation="0" sectionWidth="44" frameJoinStyle="miter" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" positionOnPage="62.9048,188.347,mm" blendMode="0" sectionX="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" referencePoint="0" visibility="1" excludeFromExports="0" sectionY="0" zValue="4" background="false" frame="false" type="65647" outlineWidthM="0.3,mm" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" hideBackgroundIfEmpty="0" position="62.9048,182.447,mm" opacity="1" positionLock="false" size="44,5.9,mm" groupUuid="" hidePageIfEmpty="0" id="" itemRotation="0" sectionWidth="44" frameJoinStyle="miter" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" positionOnPage="62.9048,182.447,mm" blendMode="0" sectionX="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" referencePoint="0" visibility="1" excludeFromExports="0" cornerRadiusMeasure="0,mm" zValue="3" background="false" frame="false" type="65643" outlineWidthM="0.3,mm" position="17.7113,33.9068,mm" opacity="1" shapeType="1" positionLock="false" size="178.865,0.746323,mm" groupUuid="" id="" itemRotation="0" frameJoinStyle="miter" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" positionOnPage="17.7113,33.9068,mm" blendMode="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="2" background="false" frame="true" type="65641" outlineWidthM="0.3,mm" position="85.0548,26.9871,mm" opacity="1" marginX="0" positionLock="false" size="49.4242,4.61973,mm" groupUuid="" id="title" itemRotation="0" frameJoinStyle="miter" htmlState="0" labelText="" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" marginY="0" positionOnPage="85.0548,26.9871,mm" blendMode="0" halign="4" valign="32">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" referencePoint="0" visibility="1" excludeFromExports="0" zValue="1" background="true" labelMargin="0,mm" frame="true" type="65639" outlineWidthM="0.2,mm" followPreset="false" followPresetName="" position="18.572,40.2423,mm" opacity="1" positionLock="false" size="177.676,98.3225,mm" keepLayerSet="false" groupUuid="" id="map" itemRotation="0" frameJoinStyle="miter" drawCanvasItems="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" positionOnPage="18.572,40.2423,mm" blendMode="0" mapFlags="0" mapRotation="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapAtlasMargin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="&quot;rotation&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="&quot;scale&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="4576604.16589934565126896" xmin="419062.98866385139990598" xmax="419196.24566398735623807" ymax="4576677.90777442045509815"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid maximumIntervalWidth="100" rightAnnotationDisplay="0" unit="0" gridFrameStyle="0" offsetX="0" intervalY="0" bottomAnnotationDirection="0" annotationPrecision="3" bottomAnnotationPosition="1" name="Cuadr�cula 1" annotationFormat="0" bottomFrameDivisions="0" frameFillColor1="255,255,255,255" rightFrameDivisions="0" bottomAnnotationDisplay="0" leftFrameDivisions="0" gridFrameMargin="0" intervalX="0" topAnnotationDirection="0" topAnnotationPosition="1" show="0" crossLength="3" minimumIntervalWidth="50" rightAnnotationPosition="1" annotationExpression="" gridFrameSideFlags="15" position="3" leftAnnotationPosition="1" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" showAnnotation="0" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFrameWidth="2" offsetY="0" blendMode="0" frameAnnotationDistance="1" gridStyle="0" annotationFontColor="0,0,0,255" frameFillColor2="0,0,0,255" gridFramePenThickness="0.5" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" topFrameDivisions="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame wrapString="" emptyTableMessage="" relationId="" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" cellMargin="1" showUniqueRowsOnly="0" resizeMode="0" wrapBehavior="0" headerMode="2" emptyTableMode="0" type="65649" gridColor="0,0,0,255" showGrid="0" contentFontColor="0,0,0,255" headerHAlignment="3" source="0" verticalGrid="1" showOnlyVisibleFeatures="0" headerFontColor="0,0,0,255" maxFeatures="30" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" horizontalGrid="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterFeatures="false" featureFilter="" gridStrokeWidth="0.2" showEmptyRows="0">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_id" heading="psector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="name" heading="name">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_type" heading="psector_type">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="descript" heading="descript">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="priority" heading="priority">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_arc" heading="total_arc">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_node" heading="total_node">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_other" heading="total_other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text1" heading="text1">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text2" heading="text2">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="observ" heading="observ">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="rotation" heading="rotation">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="scale" heading="scale">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="sector_id" heading="sector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="active" heading="active">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pem" heading="pem">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="gexpenses" heading="gexpenses">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec" heading="pec">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="vat" heading="vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec_vat" heading="pec_vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="other" heading="other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pca" heading="pca">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame wrapString="" emptyTableMessage="" relationId="" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" cellMargin="1" showUniqueRowsOnly="0" resizeMode="0" wrapBehavior="0" headerMode="2" emptyTableMode="0" type="65649" gridColor="0,0,0,255" showGrid="0" contentFontColor="0,0,0,255" headerHAlignment="3" source="0" verticalGrid="1" showOnlyVisibleFeatures="0" headerFontColor="0,0,0,255" maxFeatures="30" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" horizontalGrid="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterFeatures="false" featureFilter="" gridStrokeWidth="0.5" showEmptyRows="0">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_id" heading="psector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="name" heading="name">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="psector_type" heading="psector_type">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="descript" heading="descript">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="priority" heading="priority">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_arc" heading="total_arc">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_node" heading="total_node">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="total_other" heading="total_other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text1" heading="text1">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="text2" heading="text2">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="observ" heading="observ">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="rotation" heading="rotation">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="scale" heading="scale">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="sector_id" heading="sector_id">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="active" heading="active">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pem" heading="pem">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="gexpenses" heading="gexpenses">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec" heading="pec">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="vat" heading="vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pec_vat" heading="pec_vat">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="other" heading="other">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column sortByRank="0" vAlignment="128" sortOrder="0" hAlignment="1" width="0" attribute="pca" heading="pca">
-            <backgroundColor blue="0" alpha="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas coverageLayer="" enabled="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="" sortFeatures="1" filterFeatures="1" featureFilter=" &quot;psector_id&quot; " hideCoverage="1" sortKey="psector_id" sortAscending="1"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>
diff --git a/templates/qgisproject/en/ws_basic.qgs b/templates/qgisproject/en/ws_basic.qgs
index 88d771344..177deb9d1 100644
--- a/templates/qgisproject/en/ws_basic.qgs
+++ b/templates/qgisproject/en/ws_basic.qgs
@@ -20,85 +20,85 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="INVENTORY" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group name="Map zones" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer name="Exploitation" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dma" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dma20190515092620863" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_sector20171204170540567" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dqa" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Presszone" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Minsector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Network" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-layer name="Node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Link" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_link20160511142132204" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group name="Polygon GROUP" checked="Qt::Checked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer name="Fountain polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Register polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Tank polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Other" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_dimensions20170628134034849" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Element" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_element20170828122555146" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_samplepoint20170619120830016" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="BASEMAP" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group name="Address" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ext_municipality20171204170633784" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_ext_address20180201103159332" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Streetaxis" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_plot20180201103159443" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -127,28 +127,28 @@
       <item>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" unit="1" enabled="1" type="1" tolerance="15" mode="3">
+  <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting units="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_plot20180201103159443" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="0" id="v_edit_dimensions20170628134034849" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_edit_dma20190515092620863" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_samplepoint20170619120830016" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_sector20171204170540567" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_address20180201103159332" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_link20160511142132204" enabled="1" type="2" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_element20170828122555146" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="ext_municipality20171204170633784" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" enabled="0" type="1" tolerance="12"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -179,115 +179,115 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="INVENTORY" checked="Qt::Checked">
-      <legendgroup open="false" name="Map zones" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Exploitation" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dma" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Sector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dqa" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Presszone" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Minsector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Network" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Arc" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Link" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" name="Polygon GROUP" checked="Qt::Checked">
-          <legendlayer open="true" showFeatureCount="0" name="Fountain polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Register polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Tank polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Other" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Dimensioning" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Element" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Sample point" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="BASEMAP" checked="Qt::Checked">
-      <legendgroup open="true" name="Address" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Municipality" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Address" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Streetaxis" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Plot" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
@@ -297,7 +297,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -356,7 +356,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -380,26 +380,26 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -417,56 +417,68 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -480,34 +492,34 @@
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="muni_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="183" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -539,10 +551,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="observ"/>
+        <field name="active" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="observ" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="active"/>
@@ -554,7 +566,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -613,7 +625,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -637,118 +649,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule label="Obsolete" key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" symbol="0"/>
-          <rule label="On service" key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" symbol="1"/>
-          <rule label="Planified" key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" symbol="2"/>
-          <rule label="Varc" key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " symbol="3"/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -757,79 +769,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="arccat_id">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placementFlags="10" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="0" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -843,21 +855,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -988,6 +1000,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -1058,6 +1077,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -1072,6 +1098,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="dqa_id">
           <editWidget type="Range">
             <config>
@@ -1079,6 +1112,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -1366,6 +1406,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="depth">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="arc_id" name="" index="0"/>
@@ -1386,364 +1461,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="15"/>
         <alias field="macroexpl_id" name="" index="16"/>
         <alias field="sector_id" name="" index="17"/>
-        <alias field="macrosector_id" name="" index="18"/>
-        <alias field="state" name="" index="19"/>
-        <alias field="state_type" name="" index="20"/>
-        <alias field="annotation" name="" index="21"/>
-        <alias field="observ" name="" index="22"/>
-        <alias field="comment" name="" index="23"/>
-        <alias field="gis_length" name="" index="24"/>
-        <alias field="custom_length" name="" index="25"/>
-        <alias field="minsector_id" name="" index="26"/>
-        <alias field="dma_id" name="" index="27"/>
-        <alias field="macrodma_id" name="" index="28"/>
-        <alias field="presszone_id" name="" index="29"/>
-        <alias field="dqa_id" name="" index="30"/>
-        <alias field="macrodqa_id" name="" index="31"/>
-        <alias field="soilcat_id" name="" index="32"/>
-        <alias field="function_type" name="" index="33"/>
-        <alias field="category_type" name="" index="34"/>
-        <alias field="fluid_type" name="" index="35"/>
-        <alias field="location_type" name="" index="36"/>
-        <alias field="workcat_id" name="" index="37"/>
-        <alias field="workcat_id_end" name="" index="38"/>
-        <alias field="buildercat_id" name="" index="39"/>
-        <alias field="builtdate" name="" index="40"/>
-        <alias field="enddate" name="" index="41"/>
-        <alias field="ownercat_id" name="" index="42"/>
-        <alias field="muni_id" name="" index="43"/>
-        <alias field="postcode" name="" index="44"/>
-        <alias field="district_id" name="" index="45"/>
-        <alias field="streetname" name="" index="46"/>
-        <alias field="postnumber" name="" index="47"/>
-        <alias field="postcomplement" name="" index="48"/>
-        <alias field="streetname2" name="" index="49"/>
-        <alias field="postnumber2" name="" index="50"/>
-        <alias field="postcomplement2" name="" index="51"/>
-        <alias field="descript" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="cat_arctype_id" name="" index="63"/>
-        <alias field="nodetype_1" name="" index="64"/>
-        <alias field="staticpress1" name="" index="65"/>
-        <alias field="nodetype_2" name="" index="66"/>
-        <alias field="staticpress2" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation1" applyOnUpdate="0" expression=""/>
-        <default field="depth1" applyOnUpdate="0" expression=""/>
-        <default field="elevation2" applyOnUpdate="0" expression=""/>
-        <default field="depth2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="cat_arctype_id" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_1" applyOnUpdate="0" expression=""/>
-        <default field="staticpress1" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_2" applyOnUpdate="0" expression=""/>
-        <default field="staticpress2" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_arctype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation1" desc="" exp=""/>
-        <constraint field="depth1" desc="" exp=""/>
-        <constraint field="elevation2" desc="" exp=""/>
-        <constraint field="depth2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="cat_arctype_id" desc="" exp=""/>
-        <constraint field="nodetype_1" desc="" exp=""/>
-        <constraint field="staticpress1" desc="" exp=""/>
-        <constraint field="nodetype_2" desc="" exp=""/>
-        <constraint field="staticpress2" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="node_1" hidden="0" width="-1" type="field"/>
-          <column name="node_2" hidden="0" width="-1" type="field"/>
-          <column name="elevation1" hidden="0" width="-1" type="field"/>
-          <column name="depth1" hidden="0" width="-1" type="field"/>
-          <column name="elevation2" hidden="0" width="-1" type="field"/>
-          <column name="depth2" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="custom_length" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="cat_arctype_id" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_1" hidden="0" width="-1" type="field"/>
-          <column name="staticpress1" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_2" hidden="0" width="-1" type="field"/>
-          <column name="staticpress2" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1775,79 +1886,79 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="arc_type"/>
-        <field editable="1" name="arccat_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_arctype_id"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="custom_length"/>
-        <field editable="1" name="depth1"/>
-        <field editable="1" name="depth2"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation1"/>
-        <field editable="1" name="elevation2"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_1"/>
-        <field editable="1" name="node_2"/>
-        <field editable="1" name="nodetype_1"/>
-        <field editable="1" name="nodetype_2"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpress1"/>
-        <field editable="1" name="staticpress2"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="arc_type" editable="1"/>
+        <field name="arccat_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_arctype_id" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="custom_length" editable="1"/>
+        <field name="depth1" editable="1"/>
+        <field name="depth2" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation1" editable="1"/>
+        <field name="elevation2" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_1" editable="1"/>
+        <field name="node_2" editable="1"/>
+        <field name="nodetype_1" editable="1"/>
+        <field name="nodetype_2" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpress1" editable="1"/>
+        <field name="staticpress2" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -1928,7 +2039,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -1987,7 +2098,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -2011,179 +2122,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule label="Greentap" scalemindenom="1" key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; = 'GREENTAP'" symbol="0"/>
-          <rule label="Wjoin" scalemindenom="1" key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='WJOIN'" symbol="1"/>
-          <rule label="Tap" scalemindenom="1" key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='TAP'" symbol="2"/>
-          <rule label="Fountain" scalemindenom="1" key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='FOUNTAIN'" symbol="3"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2199,21 +2310,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2288,6 +2399,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -2393,6 +2511,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -2407,6 +2532,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -2421,6 +2553,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -2722,6 +2861,27 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="connec_id" name="" index="0"/>
@@ -2734,372 +2894,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="7"/>
         <alias field="macroexpl_id" name="" index="8"/>
         <alias field="sector_id" name="" index="9"/>
-        <alias field="macrosector_id" name="" index="10"/>
-        <alias field="customer_code" name="" index="11"/>
-        <alias field="cat_matcat_id" name="" index="12"/>
-        <alias field="cat_pnom" name="" index="13"/>
-        <alias field="cat_dnom" name="" index="14"/>
-        <alias field="connec_length" name="" index="15"/>
-        <alias field="state" name="" index="16"/>
-        <alias field="state_type" name="" index="17"/>
-        <alias field="n_hydrometer" name="" index="18"/>
-        <alias field="arc_id" name="" index="19"/>
-        <alias field="annotation" name="" index="20"/>
-        <alias field="observ" name="" index="21"/>
-        <alias field="comment" name="" index="22"/>
-        <alias field="minsector_id" name="" index="23"/>
-        <alias field="dma_id" name="" index="24"/>
-        <alias field="macrodma_id" name="" index="25"/>
-        <alias field="presszone_id" name="" index="26"/>
-        <alias field="staticpressure" name="" index="27"/>
-        <alias field="dqa_id" name="" index="28"/>
-        <alias field="macrodqa_id" name="" index="29"/>
-        <alias field="soilcat_id" name="" index="30"/>
-        <alias field="function_type" name="" index="31"/>
-        <alias field="category_type" name="" index="32"/>
-        <alias field="fluid_type" name="" index="33"/>
-        <alias field="location_type" name="" index="34"/>
-        <alias field="workcat_id" name="" index="35"/>
-        <alias field="workcat_id_end" name="" index="36"/>
-        <alias field="buildercat_id" name="" index="37"/>
-        <alias field="builtdate" name="" index="38"/>
-        <alias field="enddate" name="" index="39"/>
-        <alias field="ownercat_id" name="" index="40"/>
-        <alias field="muni_id" name="" index="41"/>
-        <alias field="postcode" name="" index="42"/>
-        <alias field="district_id" name="" index="43"/>
-        <alias field="streetname" name="" index="44"/>
-        <alias field="postnumber" name="" index="45"/>
-        <alias field="postcomplement" name="" index="46"/>
-        <alias field="streetname2" name="" index="47"/>
-        <alias field="postnumber2" name="" index="48"/>
-        <alias field="postcomplement2" name="" index="49"/>
-        <alias field="descript" name="" index="50"/>
-        <alias field="svg" name="" index="51"/>
-        <alias field="rotation" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="connectype_id" name="" index="63"/>
-        <alias field="feature_id" name="" index="64"/>
-        <alias field="featurecat_id" name="" index="65"/>
-        <alias field="pjoint_id" name="" index="66"/>
-        <alias field="pjoint_type" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connec_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="connec_length" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="n_hydrometer" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="connectype_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="n_hydrometer" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connectype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connec_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="connec_length" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="n_hydrometer" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="connectype_id" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="connec_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="connecat_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="connec_length" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="n_hydrometer" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="connectype_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_type" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3131,78 +3319,78 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="connec_length"/>
-        <field editable="1" name="connec_type"/>
-        <field editable="1" name="connecat_id"/>
-        <field editable="1" name="connectype_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="n_hydrometer"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="pjoint_id"/>
-        <field editable="1" name="pjoint_type"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="connec_id" editable="1"/>
+        <field name="connec_length" editable="1"/>
+        <field name="connec_type" editable="1"/>
+        <field name="connecat_id" editable="1"/>
+        <field name="connectype_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="n_hydrometer" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pjoint_id" editable="1"/>
+        <field name="pjoint_type" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -3282,7 +3470,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -3335,7 +3523,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -3359,586 +3547,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-          <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-          <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot; +180"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-                <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@4" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -3948,611 +4136,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule scalemindenom="1" key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{750be282-d4cc-4137-9551-e68430260327}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -4708,27 +4896,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4737,8 +4925,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4747,8 +4935,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4757,8 +4945,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4767,16 +4955,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -4784,8 +4975,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4794,8 +4985,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4804,23 +4995,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -4828,8 +5025,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4838,34 +5035,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4874,16 +5065,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -4909,81 +5103,82 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="x_label" applyOnUpdate="0" expression=""/>
-        <default field="y_label" applyOnUpdate="0" expression=""/>
-        <default field="rotation_label" applyOnUpdate="0" expression=""/>
-        <default field="offset_label" applyOnUpdate="0" expression=""/>
-        <default field="direction_arrow" applyOnUpdate="0" expression=""/>
-        <default field="x_symbol" applyOnUpdate="0" expression=""/>
-        <default field="y_symbol" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="offset_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="direction_arrow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="x_label" desc="" exp=""/>
-        <constraint field="y_label" desc="" exp=""/>
-        <constraint field="rotation_label" desc="" exp=""/>
-        <constraint field="offset_label" desc="" exp=""/>
-        <constraint field="direction_arrow" desc="" exp=""/>
-        <constraint field="x_symbol" desc="" exp=""/>
-        <constraint field="y_symbol" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="x_label" hidden="0" width="-1" type="field"/>
-          <column name="y_label" hidden="0" width="-1" type="field"/>
-          <column name="rotation_label" hidden="0" width="-1" type="field"/>
-          <column name="offset_label" hidden="0" width="-1" type="field"/>
-          <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-          <column name="x_symbol" hidden="0" width="-1" type="field"/>
-          <column name="y_symbol" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5015,24 +5210,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="direction_arrow"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="offset_label"/>
-        <field editable="1" name="rotation_label"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="x_label"/>
-        <field editable="1" name="x_symbol"/>
-        <field editable="1" name="y_label"/>
-        <field editable="1" name="y_symbol"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="direction_arrow" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="offset_label" editable="1"/>
+        <field name="rotation_label" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="x_label" editable="1"/>
+        <field name="x_symbol" editable="1"/>
+        <field name="y_label" editable="1"/>
+        <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -5053,7 +5249,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -5112,7 +5308,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -5136,145 +5332,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dma1-1d" value="dma1-1d" symbol="0"/>
-          <category render="true" label="dma1-2d" value="dma1-2d" symbol="1"/>
-          <category render="true" label="dma2-1d" value="dma2-1d" symbol="2"/>
-          <category render="true" label="source-1" value="source-1" symbol="3"/>
-          <category render="true" label="source-2" value="source-2" symbol="4"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5292,27 +5488,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="dma_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5321,8 +5517,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5331,8 +5527,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5341,8 +5537,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5351,8 +5547,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5361,8 +5557,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5371,8 +5567,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5381,8 +5577,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5391,8 +5587,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5401,8 +5597,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5411,8 +5607,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5421,8 +5617,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5431,8 +5627,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5463,74 +5659,74 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="minc" applyOnUpdate="0" expression=""/>
-        <default field="maxc" applyOnUpdate="0" expression=""/>
-        <default field="effc" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dma_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="effc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="minc" desc="" exp=""/>
-        <constraint field="maxc" desc="" exp=""/>
-        <constraint field="effc" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" notificationMessage="" id="{be5d940b-02fd-451d-a305-acaddf30c925}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="176" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="minc" hidden="0" width="-1" type="field"/>
-          <column name="maxc" hidden="0" width="-1" type="field"/>
-          <column name="effc" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5562,18 +5758,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="effc"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="maxc"/>
-        <field editable="1" name="minc"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="effc" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="maxc" editable="1"/>
+        <field name="minc" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -5593,7 +5789,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -5652,7 +5848,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -5676,122 +5872,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dqa1-1d" value="dqa1-1d" symbol="0"/>
-          <category render="true" label="dqa1-1s" value="dqa1-1s" symbol="1"/>
-          <category render="true" label="dqa2-1d" value="dqa2-1d" symbol="2"/>
-          <category render="true" label="dqa2-1s" value="dqa2-1s" symbol="3"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5814,21 +6010,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5837,8 +6033,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5847,8 +6043,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5857,8 +6053,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5867,8 +6063,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5877,8 +6073,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5887,8 +6083,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5897,8 +6093,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5907,8 +6103,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5917,8 +6113,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5927,8 +6123,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5957,61 +6153,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_type" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dqa_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="dqa_type" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_type" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6043,17 +6239,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="dqa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="nodeparent"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="dqa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="nodeparent" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -6072,13 +6268,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -6131,7 +6321,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -6155,33 +6345,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6199,21 +6389,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6221,21 +6411,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6243,8 +6442,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6253,41 +6452,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CANCELED FICTICIOUS" type="QString" value="95"/>
-                  <Option name="CANCELED PLANIFIED" type="QString" value="96"/>
-                  <Option name="DONE FICTICIOUS" type="QString" value="97"/>
-                  <Option name="DONE PLANIFIED" type="QString" value="98"/>
-                  <Option name="FICTICIUS" type="QString" value="99"/>
-                  <Option name="OBSOLETE" type="QString" value="1"/>
-                  <Option name="ON_SERVICE" type="QString" value="2"/>
-                  <Option name="PLANIFIED" type="QString" value="3"/>
-                  <Option name="PROVISIONAL" type="QString" value="5"/>
-                  <Option name="RECONSTRUCT" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6296,8 +6482,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6306,8 +6492,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6316,8 +6502,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6325,42 +6511,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Category" type="QString" value="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Location" type="QString" value="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Fluid" type="QString" value="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6368,27 +6551,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="builder1" type="QString" value="builder1"/>
-                  <Option name="builder2" type="QString" value="builder2"/>
-                  <Option name="builder3" type="QString" value="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6397,8 +6582,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6407,22 +6592,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="owner1" type="QString" value="owner1"/>
-                  <Option name="owner2" type="QString" value="owner2"/>
-                  <Option name="owner3" type="QString" value="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6431,8 +6612,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6441,21 +6622,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6464,8 +6642,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6474,8 +6652,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6484,8 +6662,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6494,16 +6672,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6511,21 +6692,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6562,142 +6750,147 @@ def my_form_open(dialog, layer, feature):
         <alias field="inventory" name="inventory" index="27"/>
         <alias field="undelete" name="undelete" index="28"/>
         <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="element_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elementcat_id" applyOnUpdate="0" expression=""/>
-        <default field="elementtype_id" applyOnUpdate="0" expression=""/>
-        <default field="serial_number" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="num_elements" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="element_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementtype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="serial_number" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_elements" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="element_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elementcat_id" desc="" exp=""/>
-        <constraint field="elementtype_id" desc="" exp=""/>
-        <constraint field="serial_number" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="num_elements" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="element_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elementcat_id" hidden="0" width="-1" type="field"/>
-          <column name="serial_number" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="num_elements" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="elementtype_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6729,36 +6922,37 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="element_id"/>
-        <field editable="1" name="elementcat_id"/>
-        <field editable="1" name="elementtype_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="num_elements"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="serial_number"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="element_id" editable="1"/>
+        <field name="elementcat_id" editable="1"/>
+        <field name="elementtype_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="num_elements" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="serial_number" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="buildercat_id"/>
@@ -6782,6 +6976,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -6803,7 +6998,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -6862,7 +7057,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -6886,26 +7081,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6923,37 +7118,43 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="expl_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6962,20 +7163,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Macroexploitation-1" type="QString" value="1"/>
-                  <Option name="Undefined" type="QString" value="0"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6984,23 +7183,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7016,42 +7224,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="expl_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="168" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7083,12 +7291,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -7102,7 +7310,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7162,7 +7370,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7186,69 +7394,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -7268,27 +7476,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="link_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7297,24 +7505,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7323,24 +7525,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7349,92 +7545,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrosector_01" type="QString" value="1"/>
-                  <Option name="macrosector_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7443,8 +7615,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7453,8 +7625,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7462,28 +7634,40 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7510,86 +7694,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="link_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="exit_type" applyOnUpdate="0" expression=""/>
-        <default field="exit_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="userdefined_geom" applyOnUpdate="0" expression=""/>
-        <default field="ispsectorgeom" applyOnUpdate="0" expression=""/>
-        <default field="psector_rowid" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="vnode_topelev" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="link_id" notnull_strength="2" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="userdefined_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ispsectorgeom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_rowid" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vnode_topelev" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="link_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="exit_type" desc="" exp=""/>
-        <constraint field="exit_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="userdefined_geom" desc="" exp=""/>
-        <constraint field="ispsectorgeom" desc="" exp=""/>
-        <constraint field="psector_rowid" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="vnode_topelev" desc="" exp=""/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;sector_id&quot;">
+      <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="link_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="exit_type" hidden="0" width="-1" type="field"/>
-          <column name="exit_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="userdefined_geom" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="ispsectorgeom" hidden="0" width="-1" type="field"/>
-          <column name="psector_rowid" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="vnode_topelev" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7621,23 +7805,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="exit_id"/>
-        <field editable="1" name="exit_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="ispsectorgeom"/>
-        <field editable="1" name="link_id"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="psector_rowid"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="userdefined_geom"/>
-        <field editable="1" name="vnode_topelev"/>
+        <field name="dma_id" editable="1"/>
+        <field name="exit_id" editable="1"/>
+        <field name="exit_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="ispsectorgeom" editable="1"/>
+        <field name="link_id" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="psector_rowid" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="userdefined_geom" editable="1"/>
+        <field name="vnode_topelev" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -7662,7 +7846,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7721,7 +7905,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -7745,989 +7929,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule label="Wtp" key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WTP'" symbol="0"/>
-          <rule label="Waterwell" key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WATERWELL'" symbol="1"/>
-          <rule label="Source" key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'SOURCE'" symbol="2"/>
-          <rule label="Tank" key="{5d885b4a-fd95-42b2-8da9-717face5a272}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'TANK'" symbol="3"/>
-          <rule label="Expantank" key="{eed06555-2d38-4bfe-b114-13e014b63af1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" symbol="4"/>
-          <rule label="Filter" key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FILTER'" symbol="5"/>
-          <rule label="Flexunion" key="{9f0ffeda-84af-4676-9263-119eb6042786}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FLEXUNION'" symbol="6"/>
-          <rule label="Hydrant" key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'HYDRANT'" symbol="7"/>
-          <rule label="Meter" key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'METER'" symbol="8"/>
-          <rule label="Netelement" key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETELEMENT'" symbol="9"/>
-          <rule label="Netsamplepoint" key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" symbol="10"/>
-          <rule label="Pump" key="{01479095-8f9e-40cf-b92b-6e13874561ae}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'PUMP'" symbol="11"/>
-          <rule label="Register" key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REGISTER'" symbol="12"/>
-          <rule label="Manhole" key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'MANHOLE'" symbol="13"/>
-          <rule label="Reduction" key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REDUCTION'" symbol="14"/>
-          <rule label="Valve" key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'VALVE'" symbol="15"/>
-          <rule label="Junction" key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'JUNCTION'" symbol="16"/>
-          <rule label="Netwjoin" key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" scalemaxdenom="1500" filter="&quot;sys_type&quot; = 'NETWJOIN'" symbol="17"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="10" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="11" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="12" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="13" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="14" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="15" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="16" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="17" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="7" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="8" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="9" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8744,21 +8928,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8861,6 +9045,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -8931,6 +9122,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -8945,6 +9143,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -8959,6 +9164,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -9239,6 +9451,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="node_id" name="" index="0"/>
@@ -9255,348 +9502,384 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="11"/>
         <alias field="macroexpl_id" name="" index="12"/>
         <alias field="sector_id" name="" index="13"/>
-        <alias field="macrosector_id" name="" index="14"/>
-        <alias field="arc_id" name="" index="15"/>
-        <alias field="parent_id" name="" index="16"/>
-        <alias field="state" name="" index="17"/>
-        <alias field="state_type" name="" index="18"/>
-        <alias field="annotation" name="" index="19"/>
-        <alias field="observ" name="" index="20"/>
-        <alias field="comment" name="" index="21"/>
-        <alias field="minsector_id" name="" index="22"/>
-        <alias field="dma_id" name="" index="23"/>
-        <alias field="macrodma_id" name="" index="24"/>
-        <alias field="presszone_id" name="" index="25"/>
-        <alias field="staticpressure" name="" index="26"/>
-        <alias field="dqa_id" name="" index="27"/>
-        <alias field="macrodqa_id" name="" index="28"/>
-        <alias field="soilcat_id" name="" index="29"/>
-        <alias field="function_type" name="" index="30"/>
-        <alias field="category_type" name="" index="31"/>
-        <alias field="fluid_type" name="" index="32"/>
-        <alias field="location_type" name="" index="33"/>
-        <alias field="workcat_id" name="" index="34"/>
-        <alias field="workcat_id_end" name="" index="35"/>
-        <alias field="builtdate" name="" index="36"/>
-        <alias field="enddate" name="" index="37"/>
-        <alias field="buildercat_id" name="" index="38"/>
-        <alias field="ownercat_id" name="" index="39"/>
-        <alias field="muni_id" name="" index="40"/>
-        <alias field="postcode" name="" index="41"/>
-        <alias field="district_id" name="" index="42"/>
-        <alias field="streetname" name="" index="43"/>
-        <alias field="postnumber" name="" index="44"/>
-        <alias field="postcomplement" name="" index="45"/>
-        <alias field="streetname2" name="" index="46"/>
-        <alias field="postnumber2" name="" index="47"/>
-        <alias field="postcomplement2" name="" index="48"/>
-        <alias field="descript" name="" index="49"/>
-        <alias field="svg" name="" index="50"/>
-        <alias field="rotation" name="" index="51"/>
-        <alias field="link" name="" index="52"/>
-        <alias field="verified" name="" index="53"/>
-        <alias field="undelete" name="" index="54"/>
-        <alias field="label" name="" index="55"/>
-        <alias field="label_x" name="" index="56"/>
-        <alias field="label_y" name="" index="57"/>
-        <alias field="label_rotation" name="" index="58"/>
-        <alias field="publish" name="" index="59"/>
-        <alias field="inventory" name="" index="60"/>
-        <alias field="hemisphere" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="nodetype_id" name="" index="63"/>
-        <alias field="tstamp" name="" index="64"/>
-        <alias field="insert_user" name="" index="65"/>
-        <alias field="lastupdate" name="" index="66"/>
-        <alias field="lastupdate_user" name="" index="67"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="parent_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="hemisphere" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_id" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="parent_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hemisphere" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="parent_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="hemisphere" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="nodetype_id" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="node_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="nodecat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="parent_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="hemisphere" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_id" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9628,74 +9911,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="hemisphere"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="node_type"/>
-        <field editable="1" name="nodecat_id"/>
-        <field editable="1" name="nodetype_id"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="parent_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="hemisphere" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="node_type" editable="1"/>
+        <field name="nodecat_id" editable="1"/>
+        <field name="nodetype_id" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="parent_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -9771,7 +10054,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -9779,7 +10062,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -9830,7 +10113,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -9854,168 +10137,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="pzone1-1d" value="pzone1-1d" symbol="0"/>
-          <category render="true" label="pzone1-1s" value="pzone1-1s" symbol="1"/>
-          <category render="true" label="pzone1-2d" value="pzone1-2d" symbol="2"/>
-          <category render="true" label="pzone1-2s" value="pzone1-2s" symbol="3"/>
-          <category render="true" label="pzone2-1s" value="pzone2-1s" symbol="4"/>
-          <category render="true" label="pzone2-2d" value="pzone2-2d" symbol="5"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10033,27 +10316,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -10112,42 +10395,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="presszone_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="stylesheet" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10179,12 +10462,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="head"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="stylesheet"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="head" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="stylesheet" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -10198,7 +10481,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="5000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -10251,7 +10534,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -10275,59 +10558,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10344,28 +10627,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer upperValue="0" classificationAttributeExpression="" attributeLegend="1" lowerValue="0" upperHeight="50" diagramType="Histogram" lowerWidth="0" upperWidth="50" lowerHeight="0">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="sample_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10374,8 +10657,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10384,8 +10667,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10394,8 +10677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10404,122 +10687,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ADAPTATION" type="QString" value="ADAPTATION"/>
-                  <Option name="AIR_VALVE" type="QString" value="AIR_VALVE"/>
-                  <Option name="BYPASS_REGISTER" type="QString" value="BYPASS_REGISTER"/>
-                  <Option name="CHECK_VALVE" type="QString" value="CHECK_VALVE"/>
-                  <Option name="CLORINATHOR" type="QString" value="CLORINATHOR"/>
-                  <Option name="CONTROL_REGISTER" type="QString" value="CONTROL_REGISTER"/>
-                  <Option name="CURVE" type="QString" value="CURVE"/>
-                  <Option name="ENDLINE" type="QString" value="ENDLINE"/>
-                  <Option name="EXPANTANK" type="QString" value="EXPANTANK"/>
-                  <Option name="FILTER" type="QString" value="FILTER"/>
-                  <Option name="FLEXUNION" type="QString" value="FLEXUNION"/>
-                  <Option name="FLOWMETER" type="QString" value="FLOWMETER"/>
-                  <Option name="FL_CONTR_VALVE" type="QString" value="FL_CONTR_VALVE"/>
-                  <Option name="FOUNTAIN" type="QString" value="FOUNTAIN"/>
-                  <Option name="GEN_PURP_VALVE" type="QString" value="GEN_PURP_VALVE"/>
-                  <Option name="GREENTAP" type="QString" value="GREENTAP"/>
-                  <Option name="GREEN_VALVE" type="QString" value="GREEN_VALVE"/>
-                  <Option name="HYDRANT" type="QString" value="HYDRANT"/>
-                  <Option name="JUNCTION" type="QString" value="JUNCTION"/>
-                  <Option name="MANHOLE" type="QString" value="MANHOLE"/>
-                  <Option name="NETELEMENT" type="QString" value="NETELEMENT"/>
-                  <Option name="NETSAMPLEPOINT" type="QString" value="NETSAMPLEPOINT"/>
-                  <Option name="OUTFALL_VALVE" type="QString" value="OUTFALL_VALVE"/>
-                  <Option name="PIPE" type="QString" value="PIPE"/>
-                  <Option name="PRESSURE_METER" type="QString" value="PRESSURE_METER"/>
-                  <Option name="PR_BREAK_VALVE" type="QString" value="PR_BREAK_VALVE"/>
-                  <Option name="PR_REDUC_VALVE" type="QString" value="PR_REDUC_VALVE"/>
-                  <Option name="PR_SUSTA_VALVE" type="QString" value="PR_SUSTA_VALVE"/>
-                  <Option name="PUMP" type="QString" value="PUMP"/>
-                  <Option name="REDUCTION" type="QString" value="REDUCTION"/>
-                  <Option name="REGISTER" type="QString" value="REGISTER"/>
-                  <Option name="SHUTOFF_VALVE" type="QString" value="SHUTOFF_VALVE"/>
-                  <Option name="SOURCE" type="QString" value="SOURCE"/>
-                  <Option name="T" type="QString" value="T"/>
-                  <Option name="TANK" type="QString" value="TANK"/>
-                  <Option name="TAP" type="QString" value="TAP"/>
-                  <Option name="THROTTLE_VALVE" type="QString" value="THROTTLE_VALVE"/>
-                  <Option name="VALVE_REGISTER" type="QString" value="VALVE_REGISTER"/>
-                  <Option name="VARC" type="QString" value="VARC"/>
-                  <Option name="VCONNEC" type="QString" value="VCONNEC"/>
-                  <Option name="WATERWELL" type="QString" value="WATERWELL"/>
-                  <Option name="WATER_CONNECTION" type="QString" value="WATER_CONNECTION"/>
-                  <Option name="WJOIN" type="QString" value="WJOIN"/>
-                  <Option name="WTP" type="QString" value="WTP"/>
-                  <Option name="X" type="QString" value="X"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="presszonecat_id">
-          <editWidget type="ValueMap">
+        <field name="presszone_id">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="pzone1-1d" type="QString" value="3"/>
-                  <Option name="pzone1-1s" type="QString" value="1"/>
-                  <Option name="pzone1-2d" type="QString" value="4"/>
-                  <Option name="pzone1-2s" type="QString" value="2"/>
-                  <Option name="pzone2-1s" type="QString" value="5"/>
-                  <Option name="pzone2-2d" type="QString" value="6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10528,10 +10747,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10540,32 +10760,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="work1" type="QString" value="work1"/>
-                  <Option name="work2" type="QString" value="work2"/>
-                  <Option name="work3" type="QString" value="work3"/>
-                  <Option name="work4" type="QString" value="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10573,54 +10793,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10629,14 +10823,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option name="AllowMulti" type="QString" value="0"/>
-                <Option name="AllowNull" type="QString" value="0"/>
-                <Option name="FilterExpression" type="QString" value=""/>
-                <Option name="Key" type="QString" value="postnumber"/>
-                <Option name="Layer" type="QString" value="ext_address20171204171433160"/>
-                <Option name="OrderByValue" type="QString" value="0"/>
-                <Option name="UseCompleter" type="QString" value="0"/>
-                <Option name="Value" type="QString" value="postnumber"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -10645,50 +10843,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10697,8 +10873,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10707,8 +10883,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10717,8 +10893,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10727,8 +10903,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10737,8 +10913,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10747,41 +10923,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10794,7 +10968,7 @@ def my_form_open(dialog, layer, feature):
         <alias field="featurecat_id" name="featurecat_id" index="4"/>
         <alias field="dma_id" name="dma_id" index="5"/>
         <alias field="macrodma_id" name="macrodma_id" index="6"/>
-        <alias field="presszonecat_id" name="presszonecat_id" index="7"/>
+        <alias field="presszone_id" name="" index="7"/>
         <alias field="state" name="state" index="8"/>
         <alias field="builtdate" name="builtdate" index="9"/>
         <alias field="enddate" name="enddate" index="10"/>
@@ -10820,132 +10994,134 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sample_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="lab_code" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis2_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="place_name" applyOnUpdate="0" expression=""/>
-        <default field="cabinet" applyOnUpdate="0" expression=""/>
-        <default field="observations" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sample_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lab_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis2_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="place_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cabinet" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observations" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sample_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="lab_code" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetaxis2_id" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="place_name" desc="" exp=""/>
-        <constraint field="cabinet" desc="" exp=""/>
-        <constraint field="observations" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sample_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="lab_code" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis2_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="place_name" hidden="0" width="-1" type="field"/>
-          <column name="cabinet" hidden="0" width="-1" type="field"/>
-          <column name="observations" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10977,45 +11153,49 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cabinet"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="lab_code"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observations"/>
-        <field editable="1" name="place_name"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sample_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="streetaxis2_id"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cabinet" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="lab_code" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observations" editable="1"/>
+        <field name="place_name" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sample_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="streetaxis2_id" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -11025,6 +11205,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -11039,7 +11220,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_edit_sector20171204170540567</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_sector" (the_geom) sql=</datasource>
       <keywordList>
@@ -11092,7 +11279,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11116,144 +11303,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="sector_id" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category render="true" label="0" value="0" symbol="0"/>
-          <category render="true" label="1" value="1" symbol="1"/>
-          <category render="true" label="2" value="2" symbol="2"/>
-          <category render="true" label="3" value="3" symbol="3"/>
-          <category render="true" label="4" value="4" symbol="4"/>
-          <category render="true" label="5" value="5" symbol="5"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11272,21 +11459,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11295,8 +11482,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11305,8 +11492,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11315,8 +11502,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11325,8 +11512,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11335,8 +11522,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11345,8 +11532,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11371,45 +11558,45 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="172" type="field"/>
-          <column name="descript" hidden="0" width="184" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11441,12 +11628,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="name" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -11460,7 +11647,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11519,7 +11706,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11543,33 +11730,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11580,79 +11767,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="postnumber">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="3" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="PointGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -11666,21 +11853,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11689,19 +11876,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11710,43 +11896,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11755,8 +11916,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11765,21 +11926,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11787,7 +11945,10 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11805,50 +11966,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="plot_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="plot_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="plot_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11880,14 +12041,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="plot_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="streetaxis_id"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="plot_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -11903,7 +12064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11962,7 +12123,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11986,26 +12147,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12023,33 +12184,33 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -12058,8 +12219,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12068,19 +12229,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12089,43 +12249,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12134,8 +12269,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12144,8 +12279,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12154,8 +12289,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12164,8 +12299,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12174,8 +12309,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12184,21 +12319,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12221,66 +12353,66 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="plot_code" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="complement" applyOnUpdate="0" expression=""/>
-        <default field="placement" applyOnUpdate="0" expression=""/>
-        <default field="square" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="complement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="placement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="square" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="plot_code" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="complement" desc="" exp=""/>
-        <constraint field="placement" desc="" exp=""/>
-        <constraint field="square" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="plot_code" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="complement" hidden="0" width="-1" type="field"/>
-          <column name="placement" hidden="0" width="-1" type="field"/>
-          <column name="square" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12312,18 +12444,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="complement"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="placement"/>
-        <field editable="1" name="plot_code"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="square"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="text"/>
+        <field name="complement" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="placement" editable="1"/>
+        <field name="plot_code" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="square" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="complement"/>
@@ -12343,7 +12475,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="3000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiLineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12402,7 +12534,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -12426,31 +12558,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12461,79 +12593,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Arial" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0.1875" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0.1875" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="9" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="0.6" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -12547,21 +12679,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12570,8 +12702,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12580,19 +12712,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12601,8 +12732,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12611,32 +12742,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12645,8 +12772,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12665,50 +12792,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="269" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12740,14 +12867,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="text"/>
-        <field editable="1" name="type"/>
+        <field name="code" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="text" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="code"/>
@@ -12763,7 +12890,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Polygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -12816,7 +12949,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -12840,26 +12973,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12878,21 +13011,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12901,8 +13034,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12911,8 +13044,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12921,8 +13054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12931,8 +13064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12941,8 +13074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12951,8 +13084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12969,42 +13102,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="minsector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;minsector_id&quot;">
+      <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13036,12 +13169,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="dma_id"/>
-        <field editable="0" name="dqa_id"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="minsector_id"/>
-        <field editable="0" name="presszonecat_id"/>
-        <field editable="0" name="sector_id"/>
+        <field name="dma_id" editable="0"/>
+        <field name="dqa_id" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="minsector_id" editable="0"/>
+        <field name="presszonecat_id" editable="0"/>
+        <field name="sector_id" editable="0"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -13055,7 +13188,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13114,7 +13247,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13138,26 +13271,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13175,27 +13308,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -13222,26 +13355,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13273,8 +13406,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="connec_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -13284,7 +13417,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13343,7 +13476,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13367,26 +13500,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13404,27 +13537,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -13451,26 +13584,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13502,8 +13635,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -13513,7 +13646,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13572,7 +13705,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13596,26 +13729,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13633,27 +13766,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -13680,26 +13813,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13731,8 +13864,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -13771,14 +13904,14 @@ def my_form_open(dialog, layer, feature):
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -14469,63 +14602,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="composer_plan" units="mm" worldFileMap="" printResolution="300">
-      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
-      <Grid offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" referencePoint="0" groupUuid="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" blendMode="0" position="0,0,mm" zValue="0" frameJoinStyle="miter" visibility="1" id="" size="210,297,mm" positionOnPage="0,0,mm" itemRotation="0" background="true">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14533,446 +14666,446 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" svgBorderWidth="0.2" frame="false" anchorPoint="0" pictureWidth="8.01076" excludeFromExports="0" svgBorderColor="0,0,0,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" pictureRotation="0" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" resizeMode="0" blendMode="0" position="21.2488,12.0899,mm" zValue="34" pictureHeight="8.05991" frameJoinStyle="miter" mapUuid="" visibility="1" svgFillColor="255,255,255,255" id="" size="52.9371,8.05991,mm" northMode="0" positionOnPage="21.2488,12.0899,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" labelText="Planified network:  [% &quot;plan_length&quot; %] m." halign="1" blendMode="0" position="18.5098,248.929,mm" zValue="34" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,248.929,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" labelText="Affected network:  [% &quot;affec_length&quot; %] m." halign="1" blendMode="0" position="18.5098,240.85,mm" zValue="33" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,240.85,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" halign="2" blendMode="0" position="130.06,170.278,mm" zValue="32" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="130.06,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" halign="2" blendMode="0" position="129.892,162.595,mm" zValue="31" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.892,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" halign="2" blendMode="0" position="129.892,154.849,mm" zValue="30" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.892,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" blendMode="0" position="18.5119,237.417,mm" zValue="29" frameJoinStyle="miter" visibility="1" id="" size="107.352,0.232607,mm" positionOnPage="18.5119,237.417,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" labelText="Total cost of other works:" halign="1" blendMode="0" position="18.472,170.278,mm" zValue="28" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.07458,mm" positionOnPage="18.472,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" blendMode="0" position="18.472,180.075,mm" zValue="27" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,180.075,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,191.26,mm" zValue="26" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.798,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,184.169,mm" zValue="25" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.798,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" halign="1" blendMode="0" position="18.5098,144.841,mm" zValue="24" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="97.7075,5.87319,mm" positionOnPage="18.5098,144.841,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" labelText="Total cost for node elements:" halign="1" blendMode="0" position="18.472,162.595,mm" zValue="23" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.87319,mm" positionOnPage="18.472,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" blendMode="0" position="18.4712,202.127,mm" zValue="22" frameJoinStyle="miter" visibility="1" id="" size="178.105,0.232607,mm" positionOnPage="18.4712,202.127,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" blendMode="0" position="18.472,149.994,mm" zValue="21" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,149.994,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" blendMode="0" position="17.1613,8.922,mm" zValue="19" frameJoinStyle="miter" visibility="1" id="" size="0.851544,16.1039,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" blendMode="0" position="17.1613,8.922,mm" zValue="18" frameJoinStyle="miter" visibility="1" id="" size="179.415,0.863719,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="true" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" mapFlags="0" blendMode="0" position="131.014,237.517,mm" zValue="17" frameJoinStyle="miter" visibility="1" followPreset="false" id="" size="65.4621,46.5539,mm" keepLayerSet="true" positionOnPage="131.014,237.517,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4577071.35527538601309061" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymin="4576100.62452332023531199"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" layerid="ext_municipality20171204170633784">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -15132,66 +15265,66 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="muni_id" name="" index="0"/>
-                <alias field="name" name="" index="1"/>
-                <alias field="observ" name="" index="2"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="name" hidden="0" width="183" type="field"/>
-                  <column name="observ" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -15223,442 +15356,442 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="muni_id" expression=""/>
-                <default field="name" expression=""/>
-                <default field="observ" expression=""/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="name"/>
+                <default expression="" field="observ"/>
               </defaults>
               <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_dimensions20170628134034849">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-                  <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-                  <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol name="@2@1" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@2@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol name="@2@3" alpha="1" clip_to_extent="1" type="fill">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleFill">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol name="@2@4" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -15667,143 +15800,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule scalemindenom="1" key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -15963,88 +16096,88 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="distance" name="" index="1"/>
-                <alias field="depth" name="" index="2"/>
-                <alias field="x_label" name="" index="3"/>
-                <alias field="y_label" name="" index="4"/>
-                <alias field="rotation_label" name="" index="5"/>
-                <alias field="offset_label" name="" index="6"/>
-                <alias field="direction_arrow" name="" index="7"/>
-                <alias field="x_symbol" name="" index="8"/>
-                <alias field="y_symbol" name="" index="9"/>
-                <alias field="feature_id" name="" index="10"/>
-                <alias field="feature_type" name="" index="11"/>
-                <alias field="state" name="" index="12"/>
-                <alias field="expl_id" name="" index="13"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+              <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="distance" hidden="0" width="-1" type="field"/>
-                  <column name="depth" hidden="0" width="-1" type="field"/>
-                  <column name="x_label" hidden="0" width="-1" type="field"/>
-                  <column name="y_label" hidden="0" width="-1" type="field"/>
-                  <column name="rotation_label" hidden="0" width="-1" type="field"/>
-                  <column name="offset_label" hidden="0" width="-1" type="field"/>
-                  <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-                  <column name="x_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="y_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="feature_id" hidden="0" width="-1" type="field"/>
-                  <column name="feature_type" hidden="0" width="-1" type="field"/>
-                  <column name="state" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -16076,151 +16209,151 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="distance" expression=""/>
-                <default field="depth" expression=""/>
-                <default field="x_label" expression=""/>
-                <default field="y_label" expression=""/>
-                <default field="rotation_label" expression=""/>
-                <default field="offset_label" expression=""/>
-                <default field="direction_arrow" expression=""/>
-                <default field="x_symbol" expression=""/>
-                <default field="y_symbol" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="feature_type" expression=""/>
-                <default field="state" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="distance"/>
+                <default expression="" field="depth"/>
+                <default expression="" field="x_label"/>
+                <default expression="" field="y_label"/>
+                <default expression="" field="rotation_label"/>
+                <default expression="" field="offset_label"/>
+                <default expression="" field="direction_arrow"/>
+                <default expression="" field="x_symbol"/>
+                <default expression="" field="y_symbol"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="feature_type"/>
+                <default expression="" field="state"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_samplepoint20170619120830016">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="dma_id" notNull="0" Layer="v_edit_dma20180201085045064" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_state20160216123517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="muni_id" notNull="0" Layer="ext_municipality20171204170633784" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="ext_streetaxis20160528211138508" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="postnumber" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="postnumber" notNull="0" Layer="ext_address20171204171433160" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_verified20160216164517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="expl_id" notNull="0" Layer="exploitation20180122152954062" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                     <layer locked="0" pass="0" class="FontMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -16380,85 +16513,85 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer classificationAttributeExpression="" upperValue="0" attributeLegend="1" upperHeight="50" lowerValue="0" diagramType="Histogram" lowerWidth="0" upperWidth="50" sizeLegend="0" lowerHeight="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="sample_id" name="" index="0"/>
-                <alias field="code" name="" index="1"/>
-                <alias field="lab_code" name="" index="2"/>
-                <alias field="feature_id" name="" index="3"/>
-                <alias field="featurecat_id" name="" index="4"/>
-                <alias field="dma_id" name="" index="5"/>
-                <alias field="macrodma_id" name="" index="6"/>
-                <alias field="presszonecat_id" name="" index="7"/>
-                <alias field="state" name="" index="8"/>
-                <alias field="builtdate" name="" index="9"/>
-                <alias field="enddate" name="" index="10"/>
-                <alias field="workcat_id" name="" index="11"/>
-                <alias field="workcat_id_end" name="" index="12"/>
-                <alias field="rotation" name="" index="13"/>
-                <alias field="muni_id" name="" index="14"/>
-                <alias field="streetaxis_id" name="" index="15"/>
-                <alias field="postnumber" name="" index="16"/>
-                <alias field="postcode" name="" index="17"/>
-                <alias field="streetaxis2_id" name="" index="18"/>
-                <alias field="postnumber2" name="" index="19"/>
-                <alias field="postcomplement" name="" index="20"/>
-                <alias field="postcomplement2" name="" index="21"/>
-                <alias field="place_name" name="" index="22"/>
-                <alias field="cabinet" name="" index="23"/>
-                <alias field="observations" name="" index="24"/>
-                <alias field="verified" name="" index="25"/>
-                <alias field="expl_id" name="" index="26"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -16490,85 +16623,85 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="sample_id" expression=""/>
-                <default field="code" expression=""/>
-                <default field="lab_code" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="featurecat_id" expression=""/>
-                <default field="dma_id" expression=""/>
-                <default field="macrodma_id" expression=""/>
-                <default field="presszonecat_id" expression=""/>
-                <default field="state" expression=""/>
-                <default field="builtdate" expression=""/>
-                <default field="enddate" expression=""/>
-                <default field="workcat_id" expression=""/>
-                <default field="workcat_id_end" expression=""/>
-                <default field="rotation" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis2_id" expression=""/>
-                <default field="postnumber2" expression=""/>
-                <default field="postcomplement" expression=""/>
-                <default field="postcomplement2" expression=""/>
-                <default field="place_name" expression=""/>
-                <default field="cabinet" expression=""/>
-                <default field="observations" expression=""/>
-                <default field="verified" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="sample_id"/>
+                <default expression="" field="code"/>
+                <default expression="" field="lab_code"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="featurecat_id"/>
+                <default expression="" field="dma_id"/>
+                <default expression="" field="macrodma_id"/>
+                <default expression="" field="presszonecat_id"/>
+                <default expression="" field="state"/>
+                <default expression="" field="builtdate"/>
+                <default expression="" field="enddate"/>
+                <default expression="" field="workcat_id"/>
+                <default expression="" field="workcat_id_end"/>
+                <default expression="" field="rotation"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis2_id"/>
+                <default expression="" field="postnumber2"/>
+                <default expression="" field="postcomplement"/>
+                <default expression="" field="postcomplement2"/>
+                <default expression="" field="place_name"/>
+                <default expression="" field="cabinet"/>
+                <default expression="" field="observations"/>
+                <default expression="" field="verified"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_address20180201103159332">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -16727,74 +16860,74 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="muni_id" name="" index="1"/>
-                <alias field="postcode" name="" index="2"/>
-                <alias field="streetaxis_id" name="" index="3"/>
-                <alias field="postnumber" name="" index="4"/>
-                <alias field="plot_id" name="" index="5"/>
-                <alias field="expl_id" name="" index="6"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="postcode" hidden="0" width="-1" type="field"/>
-                  <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-                  <column name="postnumber" hidden="0" width="-1" type="field"/>
-                  <column name="plot_id" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -16826,73 +16959,73 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="plot_id" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="plot_id"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_plot20180201103159443">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -17051,70 +17184,70 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="plot_code" name="" index="1"/>
-                <alias field="muni_id" name="" index="2"/>
-                <alias field="postcode" name="" index="3"/>
-                <alias field="streetaxis_id" name="" index="4"/>
-                <alias field="postnumber" name="" index="5"/>
-                <alias field="complement" name="" index="6"/>
-                <alias field="placement" name="" index="7"/>
-                <alias field="square" name="" index="8"/>
-                <alias field="observ" name="" index="9"/>
-                <alias field="text" name="" index="10"/>
-                <alias field="expl_id" name="" index="11"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -17146,116 +17279,116 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="plot_code" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="complement" expression=""/>
-                <default field="placement" expression=""/>
-                <default field="square" expression=""/>
-                <default field="observ" expression=""/>
-                <default field="text" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="plot_code"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="complement"/>
+                <default expression="" field="placement"/>
+                <default expression="" field="square"/>
+                <default expression="" field="observ"/>
+                <default expression="" field="text"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression/>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" name="Vista general 1" position="3" frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" blendMode="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" centered="0">
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17263,9 +17396,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -17274,399 +17407,399 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{04100234-7357-49e1-9d15-b7949d417719}" blendMode="0" position="17.1613,22.2695,mm" zValue="16" frameJoinStyle="miter" visibility="1" id="" size="179.415,2.75637,mm" positionOnPage="17.1613,22.2695,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" labelText="[% &quot;observ&quot; %]" halign="1" blendMode="0" position="40.013,223.173,mm" zValue="15" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="149.138,11.1067,mm" positionOnPage="40.013,223.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" labelText="[% &quot;descript&quot; %]" halign="1" blendMode="0" position="37.635,212.191,mm" zValue="14" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="153.454,10.5555,mm" positionOnPage="37.635,212.191,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" halign="1" blendMode="0" position="18.472,191.26,mm" zValue="13" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="77.862,4.52331,mm" positionOnPage="18.472,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" labelText="Observations:" halign="1" blendMode="0" position="18.2394,224.173,mm" zValue="12" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="24.3323,3.60837,mm" positionOnPage="18.2394,224.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" halign="1" blendMode="0" position="18.472,184.169,mm" zValue="11" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,5.87319,mm" positionOnPage="18.472,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" svgBorderWidth="0" frame="false" anchorPoint="0" pictureWidth="5.27855" excludeFromExports="0" svgBorderColor="255,255,255,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" pictureRotation="90" file="arrows/NorthArrow_10.svg" resizeMode="0" blendMode="0" position="186.801,128.951,mm" zValue="10" pictureHeight="6.83615" frameJoinStyle="miter" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" visibility="1" svgFillColor="0,0,0,255" id="compass" size="6.83615,6.83615,mm" northMode="0" positionOnPage="186.801,128.951,mm" itemRotation="0" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="128" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" labelText="Total cost for arc elements:" halign="1" blendMode="0" position="18.472,154.849,mm" zValue="9" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="53.284,5.87319,mm" positionOnPage="18.472,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" labelText="Description:" halign="1" blendMode="0" position="18.4712,213.104,mm" zValue="8" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="20.5677,5.87319,mm" positionOnPage="18.4712,213.104,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" labelText="Priority:  [% &quot;priority&quot; %]" halign="1" blendMode="0" position="18.4712,206.23,mm" zValue="7" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="96.1108,5.87319,mm" positionOnPage="18.4712,206.23,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" blendMode="0" position="17.603,287.775,mm" zValue="6" frameJoinStyle="miter" visibility="1" id="" size="179.614,0.746,mm" positionOnPage="17.603,287.775,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1" frame="false" sectionHeight="6.16796" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" sectionX="0" blendMode="0" position="62.9048,188.347,mm" zValue="5" frameJoinStyle="miter" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,6.16796,mm" positionOnPage="62.9048,188.347,mm" itemRotation="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1" frame="false" sectionHeight="5.9" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" sectionX="0" blendMode="0" position="62.9048,182.447,mm" zValue="4" frameJoinStyle="miter" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,5.9,mm" positionOnPage="62.9048,182.447,mm" itemRotation="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" blendMode="0" position="17.7113,33.9068,mm" zValue="3" frameJoinStyle="miter" visibility="1" id="" size="178.865,0.746323,mm" positionOnPage="17.7113,33.9068,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1" frame="true" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" labelText="" halign="4" blendMode="0" position="85.0548,26.9871,mm" zValue="2" marginX="0" frameJoinStyle="miter" visibility="1" id="title" htmlState="0" valign="32" size="49.4242,4.61973,mm" positionOnPage="85.0548,26.9871,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="false" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" mapFlags="0" blendMode="0" position="18.572,40.2423,mm" zValue="1" frameJoinStyle="miter" visibility="1" followPreset="false" id="map" size="177.676,98.3225,mm" keepLayerSet="false" positionOnPage="18.572,40.2423,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapAtlasMargin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapAtlasMargin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;rotation&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;scale&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4576677.90777442045509815" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymin="4576604.16589934565126896"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -17675,198 +17808,198 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.2" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.5" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" sortAscending="1" featureFilter=" &quot;psector_id&quot; " filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="1" sortFeatures="1" pageNameExpression="" enabled="0" sortKey="psector_id"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>
diff --git a/templates/qgisproject/en/ws_edit.qgs b/templates/qgisproject/en/ws_edit.qgs
index 7f37f77e6..13d17a3b3 100644
--- a/templates/qgisproject/en/ws_edit.qgs
+++ b/templates/qgisproject/en/ws_edit.qgs
@@ -20,121 +20,121 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="O&amp;M" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="O&amp;M">
       <customproperties/>
-      <layer-tree-layer name="Visits" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_om_visit20180201113951439" providerKey="postgres">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_om_visit20180201113951439" name="Visits" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group name="Mincut analysis" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Mincut analysis">
         <customproperties/>
-        <layer-tree-layer name="Mincut init point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" name="Mincut init point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" name="Mincut result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" name="Mincut result connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="INVENTORY" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group name="Map zones" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer name="Exploitation" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dma" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dma20190515092620863" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_sector20171204170540567" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dqa" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Presszone" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Minsector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Network" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-layer name="Node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Link" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_link20160511142132204" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group name="Polygon GROUP" checked="Qt::Checked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer name="Fountain polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Register polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Tank polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Other" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_dimensions20170628134034849" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Element" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_element20170828122555146" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_samplepoint20170619120830016" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="EDIT" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EDIT">
       <customproperties/>
-      <layer-tree-group name="CAD auxiliar layers" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="CAD auxiliar layers">
         <customproperties/>
-        <layer-tree-layer name="Circle" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" expanded="1" id="v_edit_cad_auxcircle20180403155702431" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" id="v_edit_cad_auxcircle20180403155702431" name="Circle" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" expanded="1" id="v_edit_cad_auxpoint20180403155702690" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" id="v_edit_cad_auxpoint20180403155702690" name="Point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="BASEMAP" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group name="Address" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ext_municipality20171204170633784" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_ext_address20180201103159332" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Streetaxis" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_plot20180201103159443" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -171,36 +171,36 @@
       <item>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" unit="1" enabled="1" type="1" tolerance="15" mode="3">
+  <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting units="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_plot20180201103159443" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_cad_auxpoint20180403155702690" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="v_edit_dimensions20170628134034849" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_edit_dma20190515092620863" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_samplepoint20170619120830016" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_sector20171204170540567" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_address20180201103159332" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_om_visit20180201113951439" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_link20160511142132204" enabled="1" type="2" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_cad_auxcircle20180403155702431" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_element20170828122555146" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="ext_municipality20171204170633784" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" enabled="0" type="1" tolerance="12"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_om_visit20180201113951439" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -231,163 +231,163 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" name="O&amp;M" checked="Qt::Checked">
-      <legendlayer open="true" showFeatureCount="0" name="Visits" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="O&amp;M" open="false">
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Visits" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" layerid="v_edit_om_visit20180201113951439" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="false" name="Mincut analysis" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Mincut init point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Mincut analysis" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut init point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result node" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result connec" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="true" name="INVENTORY" checked="Qt::Checked">
-      <legendgroup open="false" name="Map zones" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Exploitation" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dma" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Sector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dqa" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Presszone" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Minsector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Network" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Arc" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Link" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" name="Polygon GROUP" checked="Qt::Checked">
-          <legendlayer open="true" showFeatureCount="0" name="Fountain polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Register polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Tank polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Other" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Dimensioning" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Element" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Sample point" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="EDIT" checked="Qt::Unchecked">
-      <legendgroup open="false" name="CAD auxiliar layers" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Circle" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="EDIT" open="false">
+      <legendgroup checked="Qt::Checked" name="CAD auxiliar layers" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Circle" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="BASEMAP" checked="Qt::Checked">
-      <legendgroup open="true" name="Address" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Municipality" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Address" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Streetaxis" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Plot" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
@@ -397,7 +397,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -456,7 +456,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -480,26 +480,26 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -517,56 +517,68 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -580,34 +592,34 @@
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="muni_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="183" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -639,10 +651,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="observ"/>
+        <field name="active" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="observ" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="active"/>
@@ -654,7 +666,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -713,7 +725,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -737,118 +749,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule label="Obsolete" key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" symbol="0"/>
-          <rule label="On service" key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" symbol="1"/>
-          <rule label="Planified" key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" symbol="2"/>
-          <rule label="Varc" key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " symbol="3"/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -857,79 +869,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="arccat_id">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placementFlags="10" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="0" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -943,21 +955,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1088,6 +1100,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -1158,6 +1177,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -1172,6 +1198,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="dqa_id">
           <editWidget type="Range">
             <config>
@@ -1179,6 +1212,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -1466,6 +1506,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="depth">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="arc_id" name="" index="0"/>
@@ -1486,364 +1561,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="15"/>
         <alias field="macroexpl_id" name="" index="16"/>
         <alias field="sector_id" name="" index="17"/>
-        <alias field="macrosector_id" name="" index="18"/>
-        <alias field="state" name="" index="19"/>
-        <alias field="state_type" name="" index="20"/>
-        <alias field="annotation" name="" index="21"/>
-        <alias field="observ" name="" index="22"/>
-        <alias field="comment" name="" index="23"/>
-        <alias field="gis_length" name="" index="24"/>
-        <alias field="custom_length" name="" index="25"/>
-        <alias field="minsector_id" name="" index="26"/>
-        <alias field="dma_id" name="" index="27"/>
-        <alias field="macrodma_id" name="" index="28"/>
-        <alias field="presszone_id" name="" index="29"/>
-        <alias field="dqa_id" name="" index="30"/>
-        <alias field="macrodqa_id" name="" index="31"/>
-        <alias field="soilcat_id" name="" index="32"/>
-        <alias field="function_type" name="" index="33"/>
-        <alias field="category_type" name="" index="34"/>
-        <alias field="fluid_type" name="" index="35"/>
-        <alias field="location_type" name="" index="36"/>
-        <alias field="workcat_id" name="" index="37"/>
-        <alias field="workcat_id_end" name="" index="38"/>
-        <alias field="buildercat_id" name="" index="39"/>
-        <alias field="builtdate" name="" index="40"/>
-        <alias field="enddate" name="" index="41"/>
-        <alias field="ownercat_id" name="" index="42"/>
-        <alias field="muni_id" name="" index="43"/>
-        <alias field="postcode" name="" index="44"/>
-        <alias field="district_id" name="" index="45"/>
-        <alias field="streetname" name="" index="46"/>
-        <alias field="postnumber" name="" index="47"/>
-        <alias field="postcomplement" name="" index="48"/>
-        <alias field="streetname2" name="" index="49"/>
-        <alias field="postnumber2" name="" index="50"/>
-        <alias field="postcomplement2" name="" index="51"/>
-        <alias field="descript" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="cat_arctype_id" name="" index="63"/>
-        <alias field="nodetype_1" name="" index="64"/>
-        <alias field="staticpress1" name="" index="65"/>
-        <alias field="nodetype_2" name="" index="66"/>
-        <alias field="staticpress2" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation1" applyOnUpdate="0" expression=""/>
-        <default field="depth1" applyOnUpdate="0" expression=""/>
-        <default field="elevation2" applyOnUpdate="0" expression=""/>
-        <default field="depth2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="cat_arctype_id" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_1" applyOnUpdate="0" expression=""/>
-        <default field="staticpress1" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_2" applyOnUpdate="0" expression=""/>
-        <default field="staticpress2" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_arctype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation1" desc="" exp=""/>
-        <constraint field="depth1" desc="" exp=""/>
-        <constraint field="elevation2" desc="" exp=""/>
-        <constraint field="depth2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="cat_arctype_id" desc="" exp=""/>
-        <constraint field="nodetype_1" desc="" exp=""/>
-        <constraint field="staticpress1" desc="" exp=""/>
-        <constraint field="nodetype_2" desc="" exp=""/>
-        <constraint field="staticpress2" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="node_1" hidden="0" width="-1" type="field"/>
-          <column name="node_2" hidden="0" width="-1" type="field"/>
-          <column name="elevation1" hidden="0" width="-1" type="field"/>
-          <column name="depth1" hidden="0" width="-1" type="field"/>
-          <column name="elevation2" hidden="0" width="-1" type="field"/>
-          <column name="depth2" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="custom_length" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="cat_arctype_id" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_1" hidden="0" width="-1" type="field"/>
-          <column name="staticpress1" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_2" hidden="0" width="-1" type="field"/>
-          <column name="staticpress2" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1875,79 +1986,79 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="arc_type"/>
-        <field editable="1" name="arccat_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_arctype_id"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="custom_length"/>
-        <field editable="1" name="depth1"/>
-        <field editable="1" name="depth2"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation1"/>
-        <field editable="1" name="elevation2"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_1"/>
-        <field editable="1" name="node_2"/>
-        <field editable="1" name="nodetype_1"/>
-        <field editable="1" name="nodetype_2"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpress1"/>
-        <field editable="1" name="staticpress2"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="arc_type" editable="1"/>
+        <field name="arccat_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_arctype_id" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="custom_length" editable="1"/>
+        <field name="depth1" editable="1"/>
+        <field name="depth2" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation1" editable="1"/>
+        <field name="elevation2" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_1" editable="1"/>
+        <field name="node_2" editable="1"/>
+        <field name="nodetype_1" editable="1"/>
+        <field name="nodetype_2" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpress1" editable="1"/>
+        <field name="staticpress2" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -2028,7 +2139,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxcircle20180403155702431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxcircle" (geom_polygon) sql=</datasource>
       <keywordList>
@@ -2088,26 +2199,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="115,189,167,0"/>
-              <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="227,26,28,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="115,189,167,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="227,26,28,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2125,21 +2236,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2148,8 +2259,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2161,20 +2272,20 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2206,14 +2317,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
+        <field name="id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxpoint20180403155702690</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxpoint" (geom_point) sql=</datasource>
       <keywordList>
@@ -2273,33 +2384,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2317,21 +2428,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2340,8 +2451,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2353,20 +2464,20 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2398,14 +2509,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
+        <field name="id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -2464,7 +2575,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -2488,179 +2599,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule label="Greentap" scalemindenom="1" key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; = 'GREENTAP'" symbol="0"/>
-          <rule label="Wjoin" scalemindenom="1" key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='WJOIN'" symbol="1"/>
-          <rule label="Tap" scalemindenom="1" key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='TAP'" symbol="2"/>
-          <rule label="Fountain" scalemindenom="1" key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='FOUNTAIN'" symbol="3"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2676,21 +2787,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2765,6 +2876,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -2870,6 +2988,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -2884,6 +3009,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -2898,6 +3030,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -3199,6 +3338,27 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="connec_id" name="" index="0"/>
@@ -3211,372 +3371,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="7"/>
         <alias field="macroexpl_id" name="" index="8"/>
         <alias field="sector_id" name="" index="9"/>
-        <alias field="macrosector_id" name="" index="10"/>
-        <alias field="customer_code" name="" index="11"/>
-        <alias field="cat_matcat_id" name="" index="12"/>
-        <alias field="cat_pnom" name="" index="13"/>
-        <alias field="cat_dnom" name="" index="14"/>
-        <alias field="connec_length" name="" index="15"/>
-        <alias field="state" name="" index="16"/>
-        <alias field="state_type" name="" index="17"/>
-        <alias field="n_hydrometer" name="" index="18"/>
-        <alias field="arc_id" name="" index="19"/>
-        <alias field="annotation" name="" index="20"/>
-        <alias field="observ" name="" index="21"/>
-        <alias field="comment" name="" index="22"/>
-        <alias field="minsector_id" name="" index="23"/>
-        <alias field="dma_id" name="" index="24"/>
-        <alias field="macrodma_id" name="" index="25"/>
-        <alias field="presszone_id" name="" index="26"/>
-        <alias field="staticpressure" name="" index="27"/>
-        <alias field="dqa_id" name="" index="28"/>
-        <alias field="macrodqa_id" name="" index="29"/>
-        <alias field="soilcat_id" name="" index="30"/>
-        <alias field="function_type" name="" index="31"/>
-        <alias field="category_type" name="" index="32"/>
-        <alias field="fluid_type" name="" index="33"/>
-        <alias field="location_type" name="" index="34"/>
-        <alias field="workcat_id" name="" index="35"/>
-        <alias field="workcat_id_end" name="" index="36"/>
-        <alias field="buildercat_id" name="" index="37"/>
-        <alias field="builtdate" name="" index="38"/>
-        <alias field="enddate" name="" index="39"/>
-        <alias field="ownercat_id" name="" index="40"/>
-        <alias field="muni_id" name="" index="41"/>
-        <alias field="postcode" name="" index="42"/>
-        <alias field="district_id" name="" index="43"/>
-        <alias field="streetname" name="" index="44"/>
-        <alias field="postnumber" name="" index="45"/>
-        <alias field="postcomplement" name="" index="46"/>
-        <alias field="streetname2" name="" index="47"/>
-        <alias field="postnumber2" name="" index="48"/>
-        <alias field="postcomplement2" name="" index="49"/>
-        <alias field="descript" name="" index="50"/>
-        <alias field="svg" name="" index="51"/>
-        <alias field="rotation" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="connectype_id" name="" index="63"/>
-        <alias field="feature_id" name="" index="64"/>
-        <alias field="featurecat_id" name="" index="65"/>
-        <alias field="pjoint_id" name="" index="66"/>
-        <alias field="pjoint_type" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connec_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="connec_length" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="n_hydrometer" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="connectype_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="n_hydrometer" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connectype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connec_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="connec_length" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="n_hydrometer" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="connectype_id" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="connec_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="connecat_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="connec_length" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="n_hydrometer" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="connectype_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_type" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3608,78 +3796,78 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="connec_length"/>
-        <field editable="1" name="connec_type"/>
-        <field editable="1" name="connecat_id"/>
-        <field editable="1" name="connectype_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="n_hydrometer"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="pjoint_id"/>
-        <field editable="1" name="pjoint_type"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="connec_id" editable="1"/>
+        <field name="connec_length" editable="1"/>
+        <field name="connec_type" editable="1"/>
+        <field name="connecat_id" editable="1"/>
+        <field name="connectype_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="n_hydrometer" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pjoint_id" editable="1"/>
+        <field name="pjoint_type" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -3759,7 +3947,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -3812,7 +4000,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -3836,586 +4024,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-          <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-          <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot; +180"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-                <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@4" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -4425,611 +4613,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule scalemindenom="1" key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{750be282-d4cc-4137-9551-e68430260327}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -5185,27 +5373,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5214,8 +5402,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5224,8 +5412,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5234,8 +5422,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5244,16 +5432,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -5261,8 +5452,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5271,8 +5462,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5281,23 +5472,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -5305,8 +5502,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5315,34 +5512,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5351,16 +5542,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -5386,81 +5580,82 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="x_label" applyOnUpdate="0" expression=""/>
-        <default field="y_label" applyOnUpdate="0" expression=""/>
-        <default field="rotation_label" applyOnUpdate="0" expression=""/>
-        <default field="offset_label" applyOnUpdate="0" expression=""/>
-        <default field="direction_arrow" applyOnUpdate="0" expression=""/>
-        <default field="x_symbol" applyOnUpdate="0" expression=""/>
-        <default field="y_symbol" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="offset_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="direction_arrow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="x_label" desc="" exp=""/>
-        <constraint field="y_label" desc="" exp=""/>
-        <constraint field="rotation_label" desc="" exp=""/>
-        <constraint field="offset_label" desc="" exp=""/>
-        <constraint field="direction_arrow" desc="" exp=""/>
-        <constraint field="x_symbol" desc="" exp=""/>
-        <constraint field="y_symbol" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="x_label" hidden="0" width="-1" type="field"/>
-          <column name="y_label" hidden="0" width="-1" type="field"/>
-          <column name="rotation_label" hidden="0" width="-1" type="field"/>
-          <column name="offset_label" hidden="0" width="-1" type="field"/>
-          <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-          <column name="x_symbol" hidden="0" width="-1" type="field"/>
-          <column name="y_symbol" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5492,24 +5687,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="direction_arrow"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="offset_label"/>
-        <field editable="1" name="rotation_label"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="x_label"/>
-        <field editable="1" name="x_symbol"/>
-        <field editable="1" name="y_label"/>
-        <field editable="1" name="y_symbol"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="direction_arrow" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="offset_label" editable="1"/>
+        <field name="rotation_label" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="x_label" editable="1"/>
+        <field name="x_symbol" editable="1"/>
+        <field name="y_label" editable="1"/>
+        <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -5530,7 +5726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -5589,7 +5785,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -5613,145 +5809,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dma1-1d" value="dma1-1d" symbol="0"/>
-          <category render="true" label="dma1-2d" value="dma1-2d" symbol="1"/>
-          <category render="true" label="dma2-1d" value="dma2-1d" symbol="2"/>
-          <category render="true" label="source-1" value="source-1" symbol="3"/>
-          <category render="true" label="source-2" value="source-2" symbol="4"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5769,27 +5965,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="dma_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5798,8 +5994,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5808,8 +6004,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5818,8 +6014,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5828,8 +6024,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5838,8 +6034,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5848,8 +6044,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5858,8 +6054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5868,8 +6064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5878,8 +6074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5888,8 +6084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5898,8 +6094,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5908,8 +6104,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5940,74 +6136,74 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="minc" applyOnUpdate="0" expression=""/>
-        <default field="maxc" applyOnUpdate="0" expression=""/>
-        <default field="effc" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dma_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="effc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="minc" desc="" exp=""/>
-        <constraint field="maxc" desc="" exp=""/>
-        <constraint field="effc" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" notificationMessage="" id="{be5d940b-02fd-451d-a305-acaddf30c925}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="176" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="minc" hidden="0" width="-1" type="field"/>
-          <column name="maxc" hidden="0" width="-1" type="field"/>
-          <column name="effc" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6039,18 +6235,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="effc"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="maxc"/>
-        <field editable="1" name="minc"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="effc" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="maxc" editable="1"/>
+        <field name="minc" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -6070,7 +6266,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -6129,7 +6325,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -6153,122 +6349,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dqa1-1d" value="dqa1-1d" symbol="0"/>
-          <category render="true" label="dqa1-1s" value="dqa1-1s" symbol="1"/>
-          <category render="true" label="dqa2-1d" value="dqa2-1d" symbol="2"/>
-          <category render="true" label="dqa2-1s" value="dqa2-1s" symbol="3"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6291,21 +6487,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6314,8 +6510,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6324,8 +6520,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6334,8 +6530,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6344,8 +6540,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6354,8 +6550,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6364,8 +6560,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6374,8 +6570,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6384,8 +6580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6394,8 +6590,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6404,8 +6600,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6434,61 +6630,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_type" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dqa_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="dqa_type" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_type" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6520,17 +6716,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="dqa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="nodeparent"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="dqa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="nodeparent" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -6549,13 +6745,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -6608,7 +6798,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -6632,33 +6822,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6676,21 +6866,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6698,21 +6888,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6720,8 +6919,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6730,41 +6929,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CANCELED FICTICIOUS" type="QString" value="95"/>
-                  <Option name="CANCELED PLANIFIED" type="QString" value="96"/>
-                  <Option name="DONE FICTICIOUS" type="QString" value="97"/>
-                  <Option name="DONE PLANIFIED" type="QString" value="98"/>
-                  <Option name="FICTICIUS" type="QString" value="99"/>
-                  <Option name="OBSOLETE" type="QString" value="1"/>
-                  <Option name="ON_SERVICE" type="QString" value="2"/>
-                  <Option name="PLANIFIED" type="QString" value="3"/>
-                  <Option name="PROVISIONAL" type="QString" value="5"/>
-                  <Option name="RECONSTRUCT" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6773,8 +6959,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6783,8 +6969,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6793,8 +6979,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6802,42 +6988,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Category" type="QString" value="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Location" type="QString" value="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Fluid" type="QString" value="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6845,27 +7028,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="builder1" type="QString" value="builder1"/>
-                  <Option name="builder2" type="QString" value="builder2"/>
-                  <Option name="builder3" type="QString" value="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6874,8 +7059,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6884,22 +7069,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="owner1" type="QString" value="owner1"/>
-                  <Option name="owner2" type="QString" value="owner2"/>
-                  <Option name="owner3" type="QString" value="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6908,8 +7089,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6918,21 +7099,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6941,8 +7119,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6951,8 +7129,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6961,8 +7139,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6971,16 +7149,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6988,21 +7169,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7039,142 +7227,147 @@ def my_form_open(dialog, layer, feature):
         <alias field="inventory" name="inventory" index="27"/>
         <alias field="undelete" name="undelete" index="28"/>
         <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="element_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elementcat_id" applyOnUpdate="0" expression=""/>
-        <default field="elementtype_id" applyOnUpdate="0" expression=""/>
-        <default field="serial_number" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="num_elements" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="element_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementtype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="serial_number" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_elements" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="element_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elementcat_id" desc="" exp=""/>
-        <constraint field="elementtype_id" desc="" exp=""/>
-        <constraint field="serial_number" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="num_elements" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="element_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elementcat_id" hidden="0" width="-1" type="field"/>
-          <column name="serial_number" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="num_elements" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="elementtype_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7206,36 +7399,37 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="element_id"/>
-        <field editable="1" name="elementcat_id"/>
-        <field editable="1" name="elementtype_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="num_elements"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="serial_number"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="element_id" editable="1"/>
+        <field name="elementcat_id" editable="1"/>
+        <field name="elementtype_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="num_elements" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="serial_number" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="buildercat_id"/>
@@ -7259,6 +7453,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -7280,7 +7475,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7339,7 +7534,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -7363,26 +7558,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7400,37 +7595,43 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="expl_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7439,20 +7640,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Macroexploitation-1" type="QString" value="1"/>
-                  <Option name="Undefined" type="QString" value="0"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7461,23 +7660,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7493,42 +7701,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="expl_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="168" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7560,12 +7768,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -7579,7 +7787,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7639,7 +7847,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7663,69 +7871,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -7745,27 +7953,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="link_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7774,24 +7982,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7800,24 +8002,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7826,92 +8022,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrosector_01" type="QString" value="1"/>
-                  <Option name="macrosector_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7920,8 +8092,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7930,8 +8102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7939,28 +8111,40 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7987,86 +8171,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="link_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="exit_type" applyOnUpdate="0" expression=""/>
-        <default field="exit_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="userdefined_geom" applyOnUpdate="0" expression=""/>
-        <default field="ispsectorgeom" applyOnUpdate="0" expression=""/>
-        <default field="psector_rowid" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="vnode_topelev" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="link_id" notnull_strength="2" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="userdefined_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ispsectorgeom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_rowid" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vnode_topelev" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="link_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="exit_type" desc="" exp=""/>
-        <constraint field="exit_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="userdefined_geom" desc="" exp=""/>
-        <constraint field="ispsectorgeom" desc="" exp=""/>
-        <constraint field="psector_rowid" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="vnode_topelev" desc="" exp=""/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;sector_id&quot;">
+      <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="link_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="exit_type" hidden="0" width="-1" type="field"/>
-          <column name="exit_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="userdefined_geom" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="ispsectorgeom" hidden="0" width="-1" type="field"/>
-          <column name="psector_rowid" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="vnode_topelev" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8098,23 +8282,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="exit_id"/>
-        <field editable="1" name="exit_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="ispsectorgeom"/>
-        <field editable="1" name="link_id"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="psector_rowid"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="userdefined_geom"/>
-        <field editable="1" name="vnode_topelev"/>
+        <field name="dma_id" editable="1"/>
+        <field name="exit_id" editable="1"/>
+        <field name="exit_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="ispsectorgeom" editable="1"/>
+        <field name="link_id" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="psector_rowid" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="userdefined_geom" editable="1"/>
+        <field name="vnode_topelev" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -8139,7 +8323,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -8198,7 +8382,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -8222,989 +8406,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule label="Wtp" key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WTP'" symbol="0"/>
-          <rule label="Waterwell" key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WATERWELL'" symbol="1"/>
-          <rule label="Source" key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'SOURCE'" symbol="2"/>
-          <rule label="Tank" key="{5d885b4a-fd95-42b2-8da9-717face5a272}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'TANK'" symbol="3"/>
-          <rule label="Expantank" key="{eed06555-2d38-4bfe-b114-13e014b63af1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" symbol="4"/>
-          <rule label="Filter" key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FILTER'" symbol="5"/>
-          <rule label="Flexunion" key="{9f0ffeda-84af-4676-9263-119eb6042786}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FLEXUNION'" symbol="6"/>
-          <rule label="Hydrant" key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'HYDRANT'" symbol="7"/>
-          <rule label="Meter" key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'METER'" symbol="8"/>
-          <rule label="Netelement" key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETELEMENT'" symbol="9"/>
-          <rule label="Netsamplepoint" key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" symbol="10"/>
-          <rule label="Pump" key="{01479095-8f9e-40cf-b92b-6e13874561ae}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'PUMP'" symbol="11"/>
-          <rule label="Register" key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REGISTER'" symbol="12"/>
-          <rule label="Manhole" key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'MANHOLE'" symbol="13"/>
-          <rule label="Reduction" key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REDUCTION'" symbol="14"/>
-          <rule label="Valve" key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'VALVE'" symbol="15"/>
-          <rule label="Junction" key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'JUNCTION'" symbol="16"/>
-          <rule label="Netwjoin" key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" scalemaxdenom="1500" filter="&quot;sys_type&quot; = 'NETWJOIN'" symbol="17"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="10" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="11" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="12" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="13" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="14" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="15" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="16" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="17" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="7" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="8" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="9" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9221,21 +9405,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9338,6 +9522,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -9408,6 +9599,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -9422,6 +9620,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -9436,6 +9641,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -9716,6 +9928,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="node_id" name="" index="0"/>
@@ -9732,348 +9979,384 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="11"/>
         <alias field="macroexpl_id" name="" index="12"/>
         <alias field="sector_id" name="" index="13"/>
-        <alias field="macrosector_id" name="" index="14"/>
-        <alias field="arc_id" name="" index="15"/>
-        <alias field="parent_id" name="" index="16"/>
-        <alias field="state" name="" index="17"/>
-        <alias field="state_type" name="" index="18"/>
-        <alias field="annotation" name="" index="19"/>
-        <alias field="observ" name="" index="20"/>
-        <alias field="comment" name="" index="21"/>
-        <alias field="minsector_id" name="" index="22"/>
-        <alias field="dma_id" name="" index="23"/>
-        <alias field="macrodma_id" name="" index="24"/>
-        <alias field="presszone_id" name="" index="25"/>
-        <alias field="staticpressure" name="" index="26"/>
-        <alias field="dqa_id" name="" index="27"/>
-        <alias field="macrodqa_id" name="" index="28"/>
-        <alias field="soilcat_id" name="" index="29"/>
-        <alias field="function_type" name="" index="30"/>
-        <alias field="category_type" name="" index="31"/>
-        <alias field="fluid_type" name="" index="32"/>
-        <alias field="location_type" name="" index="33"/>
-        <alias field="workcat_id" name="" index="34"/>
-        <alias field="workcat_id_end" name="" index="35"/>
-        <alias field="builtdate" name="" index="36"/>
-        <alias field="enddate" name="" index="37"/>
-        <alias field="buildercat_id" name="" index="38"/>
-        <alias field="ownercat_id" name="" index="39"/>
-        <alias field="muni_id" name="" index="40"/>
-        <alias field="postcode" name="" index="41"/>
-        <alias field="district_id" name="" index="42"/>
-        <alias field="streetname" name="" index="43"/>
-        <alias field="postnumber" name="" index="44"/>
-        <alias field="postcomplement" name="" index="45"/>
-        <alias field="streetname2" name="" index="46"/>
-        <alias field="postnumber2" name="" index="47"/>
-        <alias field="postcomplement2" name="" index="48"/>
-        <alias field="descript" name="" index="49"/>
-        <alias field="svg" name="" index="50"/>
-        <alias field="rotation" name="" index="51"/>
-        <alias field="link" name="" index="52"/>
-        <alias field="verified" name="" index="53"/>
-        <alias field="undelete" name="" index="54"/>
-        <alias field="label" name="" index="55"/>
-        <alias field="label_x" name="" index="56"/>
-        <alias field="label_y" name="" index="57"/>
-        <alias field="label_rotation" name="" index="58"/>
-        <alias field="publish" name="" index="59"/>
-        <alias field="inventory" name="" index="60"/>
-        <alias field="hemisphere" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="nodetype_id" name="" index="63"/>
-        <alias field="tstamp" name="" index="64"/>
-        <alias field="insert_user" name="" index="65"/>
-        <alias field="lastupdate" name="" index="66"/>
-        <alias field="lastupdate_user" name="" index="67"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="parent_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="hemisphere" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_id" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="parent_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hemisphere" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="parent_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="hemisphere" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="nodetype_id" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="node_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="nodecat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="parent_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="hemisphere" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_id" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10105,74 +10388,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="hemisphere"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="node_type"/>
-        <field editable="1" name="nodecat_id"/>
-        <field editable="1" name="nodetype_id"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="parent_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="hemisphere" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="node_type" editable="1"/>
+        <field name="nodecat_id" editable="1"/>
+        <field name="nodetype_id" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="parent_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -10248,7 +10531,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -10281,6 +10564,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10297,7 +10589,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -10314,33 +10614,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="22,186,107,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="22,186,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10349,11 +10649,29 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10362,19 +10680,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="visitcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Test" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10383,8 +10700,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10393,8 +10710,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10403,8 +10720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10413,8 +10730,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10423,21 +10740,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10456,48 +10770,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="visitcat_id" applyOnUpdate="0" expression=""/>
-        <default field="ext_code" applyOnUpdate="0" expression=""/>
-        <default field="startdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="user_name" applyOnUpdate="0" expression=""/>
-        <default field="webclient_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="visitcat_id" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="startdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="user_name" expression=""/>
+        <default applyOnUpdate="0" field="webclient_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="visitcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ext_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="startdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="user_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="webclient_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="visitcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="startdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="user_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="webclient_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="visitcat_id" desc="" exp=""/>
-        <constraint field="ext_code" desc="" exp=""/>
-        <constraint field="startdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="user_name" desc="" exp=""/>
-        <constraint field="webclient_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="visitcat_id" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="startdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="user_name" desc=""/>
+        <constraint exp="" field="webclient_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="startdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="user_name" hidden="0" width="-1" type="field"/>
-          <column name="webclient_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="startdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="user_name"/>
+          <column type="field" width="-1" hidden="0" name="webclient_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="visitcat_id"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10509,25 +10825,50 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="ext_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="startdate"/>
-        <field editable="1" name="user_name"/>
-        <field editable="1" name="visitcat_id"/>
-        <field editable="1" name="webclient_id"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="ext_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="startdate" editable="1"/>
+        <field name="user_name" editable="1"/>
+        <field name="visitcat_id" editable="1"/>
+        <field name="webclient_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="enddate"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="startdate"/>
+        <field labelOnTop="0" name="user_name"/>
+        <field labelOnTop="0" name="visitcat_id"/>
+        <field labelOnTop="0" name="webclient_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "user_name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -10535,7 +10876,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -10586,7 +10927,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -10610,168 +10951,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="pzone1-1d" value="pzone1-1d" symbol="0"/>
-          <category render="true" label="pzone1-1s" value="pzone1-1s" symbol="1"/>
-          <category render="true" label="pzone1-2d" value="pzone1-2d" symbol="2"/>
-          <category render="true" label="pzone1-2s" value="pzone1-2s" symbol="3"/>
-          <category render="true" label="pzone2-1s" value="pzone2-1s" symbol="4"/>
-          <category render="true" label="pzone2-2d" value="pzone2-2d" symbol="5"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10789,27 +11130,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -10868,42 +11209,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="presszone_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="stylesheet" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10935,12 +11276,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="head"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="stylesheet"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="head" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="stylesheet" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -10954,7 +11295,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="5000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -11007,7 +11348,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11031,59 +11372,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11100,28 +11441,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer upperValue="0" classificationAttributeExpression="" attributeLegend="1" lowerValue="0" upperHeight="50" diagramType="Histogram" lowerWidth="0" upperWidth="50" lowerHeight="0">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="sample_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11130,8 +11471,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11140,8 +11481,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11150,8 +11491,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11160,122 +11501,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ADAPTATION" type="QString" value="ADAPTATION"/>
-                  <Option name="AIR_VALVE" type="QString" value="AIR_VALVE"/>
-                  <Option name="BYPASS_REGISTER" type="QString" value="BYPASS_REGISTER"/>
-                  <Option name="CHECK_VALVE" type="QString" value="CHECK_VALVE"/>
-                  <Option name="CLORINATHOR" type="QString" value="CLORINATHOR"/>
-                  <Option name="CONTROL_REGISTER" type="QString" value="CONTROL_REGISTER"/>
-                  <Option name="CURVE" type="QString" value="CURVE"/>
-                  <Option name="ENDLINE" type="QString" value="ENDLINE"/>
-                  <Option name="EXPANTANK" type="QString" value="EXPANTANK"/>
-                  <Option name="FILTER" type="QString" value="FILTER"/>
-                  <Option name="FLEXUNION" type="QString" value="FLEXUNION"/>
-                  <Option name="FLOWMETER" type="QString" value="FLOWMETER"/>
-                  <Option name="FL_CONTR_VALVE" type="QString" value="FL_CONTR_VALVE"/>
-                  <Option name="FOUNTAIN" type="QString" value="FOUNTAIN"/>
-                  <Option name="GEN_PURP_VALVE" type="QString" value="GEN_PURP_VALVE"/>
-                  <Option name="GREENTAP" type="QString" value="GREENTAP"/>
-                  <Option name="GREEN_VALVE" type="QString" value="GREEN_VALVE"/>
-                  <Option name="HYDRANT" type="QString" value="HYDRANT"/>
-                  <Option name="JUNCTION" type="QString" value="JUNCTION"/>
-                  <Option name="MANHOLE" type="QString" value="MANHOLE"/>
-                  <Option name="NETELEMENT" type="QString" value="NETELEMENT"/>
-                  <Option name="NETSAMPLEPOINT" type="QString" value="NETSAMPLEPOINT"/>
-                  <Option name="OUTFALL_VALVE" type="QString" value="OUTFALL_VALVE"/>
-                  <Option name="PIPE" type="QString" value="PIPE"/>
-                  <Option name="PRESSURE_METER" type="QString" value="PRESSURE_METER"/>
-                  <Option name="PR_BREAK_VALVE" type="QString" value="PR_BREAK_VALVE"/>
-                  <Option name="PR_REDUC_VALVE" type="QString" value="PR_REDUC_VALVE"/>
-                  <Option name="PR_SUSTA_VALVE" type="QString" value="PR_SUSTA_VALVE"/>
-                  <Option name="PUMP" type="QString" value="PUMP"/>
-                  <Option name="REDUCTION" type="QString" value="REDUCTION"/>
-                  <Option name="REGISTER" type="QString" value="REGISTER"/>
-                  <Option name="SHUTOFF_VALVE" type="QString" value="SHUTOFF_VALVE"/>
-                  <Option name="SOURCE" type="QString" value="SOURCE"/>
-                  <Option name="T" type="QString" value="T"/>
-                  <Option name="TANK" type="QString" value="TANK"/>
-                  <Option name="TAP" type="QString" value="TAP"/>
-                  <Option name="THROTTLE_VALVE" type="QString" value="THROTTLE_VALVE"/>
-                  <Option name="VALVE_REGISTER" type="QString" value="VALVE_REGISTER"/>
-                  <Option name="VARC" type="QString" value="VARC"/>
-                  <Option name="VCONNEC" type="QString" value="VCONNEC"/>
-                  <Option name="WATERWELL" type="QString" value="WATERWELL"/>
-                  <Option name="WATER_CONNECTION" type="QString" value="WATER_CONNECTION"/>
-                  <Option name="WJOIN" type="QString" value="WJOIN"/>
-                  <Option name="WTP" type="QString" value="WTP"/>
-                  <Option name="X" type="QString" value="X"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="presszonecat_id">
-          <editWidget type="ValueMap">
+        <field name="presszone_id">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="pzone1-1d" type="QString" value="3"/>
-                  <Option name="pzone1-1s" type="QString" value="1"/>
-                  <Option name="pzone1-2d" type="QString" value="4"/>
-                  <Option name="pzone1-2s" type="QString" value="2"/>
-                  <Option name="pzone2-1s" type="QString" value="5"/>
-                  <Option name="pzone2-2d" type="QString" value="6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11284,10 +11561,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11296,32 +11574,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="work1" type="QString" value="work1"/>
-                  <Option name="work2" type="QString" value="work2"/>
-                  <Option name="work3" type="QString" value="work3"/>
-                  <Option name="work4" type="QString" value="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11329,54 +11607,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11385,14 +11637,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option name="AllowMulti" type="QString" value="0"/>
-                <Option name="AllowNull" type="QString" value="0"/>
-                <Option name="FilterExpression" type="QString" value=""/>
-                <Option name="Key" type="QString" value="postnumber"/>
-                <Option name="Layer" type="QString" value="ext_address20171204171433160"/>
-                <Option name="OrderByValue" type="QString" value="0"/>
-                <Option name="UseCompleter" type="QString" value="0"/>
-                <Option name="Value" type="QString" value="postnumber"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -11401,50 +11657,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11453,8 +11687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11463,8 +11697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11473,8 +11707,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11483,8 +11717,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11493,8 +11727,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11503,41 +11737,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11550,7 +11782,7 @@ def my_form_open(dialog, layer, feature):
         <alias field="featurecat_id" name="featurecat_id" index="4"/>
         <alias field="dma_id" name="dma_id" index="5"/>
         <alias field="macrodma_id" name="macrodma_id" index="6"/>
-        <alias field="presszonecat_id" name="presszonecat_id" index="7"/>
+        <alias field="presszone_id" name="" index="7"/>
         <alias field="state" name="state" index="8"/>
         <alias field="builtdate" name="builtdate" index="9"/>
         <alias field="enddate" name="enddate" index="10"/>
@@ -11576,132 +11808,134 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sample_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="lab_code" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis2_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="place_name" applyOnUpdate="0" expression=""/>
-        <default field="cabinet" applyOnUpdate="0" expression=""/>
-        <default field="observations" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sample_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lab_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis2_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="place_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cabinet" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observations" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sample_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="lab_code" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetaxis2_id" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="place_name" desc="" exp=""/>
-        <constraint field="cabinet" desc="" exp=""/>
-        <constraint field="observations" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sample_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="lab_code" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis2_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="place_name" hidden="0" width="-1" type="field"/>
-          <column name="cabinet" hidden="0" width="-1" type="field"/>
-          <column name="observations" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11733,45 +11967,49 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cabinet"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="lab_code"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observations"/>
-        <field editable="1" name="place_name"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sample_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="streetaxis2_id"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cabinet" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="lab_code" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observations" editable="1"/>
+        <field name="place_name" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sample_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="streetaxis2_id" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -11781,6 +12019,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -11795,7 +12034,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_edit_sector20171204170540567</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_sector" (the_geom) sql=</datasource>
       <keywordList>
@@ -11848,7 +12093,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11872,144 +12117,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="sector_id" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category render="true" label="0" value="0" symbol="0"/>
-          <category render="true" label="1" value="1" symbol="1"/>
-          <category render="true" label="2" value="2" symbol="2"/>
-          <category render="true" label="3" value="3" symbol="3"/>
-          <category render="true" label="4" value="4" symbol="4"/>
-          <category render="true" label="5" value="5" symbol="5"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12028,21 +12273,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12051,8 +12296,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12061,8 +12306,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12071,8 +12316,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12081,8 +12326,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12091,8 +12336,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12101,8 +12346,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12127,45 +12372,45 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="172" type="field"/>
-          <column name="descript" hidden="0" width="184" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12197,12 +12442,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="name" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -12216,7 +12461,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12275,7 +12520,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -12299,33 +12544,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12336,79 +12581,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="postnumber">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="3" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="PointGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -12422,21 +12667,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12445,19 +12690,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12466,43 +12710,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12511,8 +12730,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12521,21 +12740,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12543,7 +12759,10 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -12561,50 +12780,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="plot_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="plot_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="plot_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12636,14 +12855,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="plot_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="streetaxis_id"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="plot_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -12659,7 +12878,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12718,7 +12937,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -12742,26 +12961,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12779,33 +12998,33 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -12814,8 +13033,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12824,19 +13043,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12845,43 +13063,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12890,8 +13083,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12900,8 +13093,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12910,8 +13103,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12920,8 +13113,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12930,8 +13123,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12940,21 +13133,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12977,66 +13167,66 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="plot_code" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="complement" applyOnUpdate="0" expression=""/>
-        <default field="placement" applyOnUpdate="0" expression=""/>
-        <default field="square" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="complement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="placement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="square" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="plot_code" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="complement" desc="" exp=""/>
-        <constraint field="placement" desc="" exp=""/>
-        <constraint field="square" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="plot_code" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="complement" hidden="0" width="-1" type="field"/>
-          <column name="placement" hidden="0" width="-1" type="field"/>
-          <column name="square" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13068,18 +13258,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="complement"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="placement"/>
-        <field editable="1" name="plot_code"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="square"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="text"/>
+        <field name="complement" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="placement" editable="1"/>
+        <field name="plot_code" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="square" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="complement"/>
@@ -13099,7 +13289,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="3000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiLineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13158,7 +13348,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13182,31 +13372,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13217,79 +13407,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Arial" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0.1875" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0.1875" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="9" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="0.6" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -13303,21 +13493,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13326,8 +13516,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13336,19 +13526,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13357,8 +13546,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13367,32 +13556,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13401,8 +13586,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13421,50 +13606,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="269" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13496,14 +13681,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="text"/>
-        <field editable="1" name="type"/>
+        <field name="code" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="text" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="code"/>
@@ -13519,7 +13704,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Polygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -13572,7 +13763,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13596,26 +13787,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13634,21 +13825,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13657,8 +13848,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13667,8 +13858,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13677,8 +13868,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13687,8 +13878,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13697,8 +13888,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13707,8 +13898,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13725,42 +13916,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="minsector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;minsector_id&quot;">
+      <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13792,12 +13983,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="dma_id"/>
-        <field editable="0" name="dqa_id"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="minsector_id"/>
-        <field editable="0" name="presszonecat_id"/>
-        <field editable="0" name="sector_id"/>
+        <field name="dma_id" editable="0"/>
+        <field name="dqa_id" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="minsector_id" editable="0"/>
+        <field name="presszonecat_id" editable="0"/>
+        <field name="sector_id" editable="0"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -13811,9 +14002,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Line" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13864,7 +14061,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13888,56 +14085,56 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="76,38,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.7"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="76,38,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.7" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="255,206,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="255,206,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13955,21 +14152,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14012,34 +14209,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14071,10 +14268,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="arc_id"/>
@@ -14086,9 +14283,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14139,7 +14342,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -14163,33 +14366,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="45,84,255,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="0,24,124,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.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="45,84,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,24,124,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14207,21 +14410,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14512,158 +14715,158 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="class" applyOnUpdate="0" expression=""/>
-        <default field="mincut_type" applyOnUpdate="0" expression=""/>
-        <default field="received_date" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_name" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="street_name" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="anl_cause" applyOnUpdate="0" expression=""/>
-        <default field="anl_tstamp" applyOnUpdate="0" expression=""/>
-        <default field="anl_user" applyOnUpdate="0" expression=""/>
-        <default field="anl_descript" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_id" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_type" applyOnUpdate="0" expression=""/>
-        <default field="forecast_start" applyOnUpdate="0" expression=""/>
-        <default field="forecast_end" applyOnUpdate="0" expression=""/>
-        <default field="assigned_to" applyOnUpdate="0" expression=""/>
-        <default field="exec_start" applyOnUpdate="0" expression=""/>
-        <default field="exec_end" applyOnUpdate="0" expression=""/>
-        <default field="exec_user" applyOnUpdate="0" expression=""/>
-        <default field="exec_descript" applyOnUpdate="0" expression=""/>
-        <default field="exec_the_geom" applyOnUpdate="0" expression=""/>
-        <default field="exec_from_plot" applyOnUpdate="0" expression=""/>
-        <default field="exec_depth" applyOnUpdate="0" expression=""/>
-        <default field="exec_appropiate" applyOnUpdate="0" expression=""/>
-        <default field="notified" applyOnUpdate="0" expression=""/>
-        <default field="output" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="mincut_type" expression=""/>
+        <default applyOnUpdate="0" field="received_date" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_name" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="street_name" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="anl_cause" expression=""/>
+        <default applyOnUpdate="0" field="anl_tstamp" expression=""/>
+        <default applyOnUpdate="0" field="anl_user" expression=""/>
+        <default applyOnUpdate="0" field="anl_descript" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_id" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_type" expression=""/>
+        <default applyOnUpdate="0" field="forecast_start" expression=""/>
+        <default applyOnUpdate="0" field="forecast_end" expression=""/>
+        <default applyOnUpdate="0" field="assigned_to" expression=""/>
+        <default applyOnUpdate="0" field="exec_start" expression=""/>
+        <default applyOnUpdate="0" field="exec_end" expression=""/>
+        <default applyOnUpdate="0" field="exec_user" expression=""/>
+        <default applyOnUpdate="0" field="exec_descript" expression=""/>
+        <default applyOnUpdate="0" field="exec_the_geom" expression=""/>
+        <default applyOnUpdate="0" field="exec_from_plot" expression=""/>
+        <default applyOnUpdate="0" field="exec_depth" expression=""/>
+        <default applyOnUpdate="0" field="exec_appropiate" expression=""/>
+        <default applyOnUpdate="0" field="notified" expression=""/>
+        <default applyOnUpdate="0" field="output" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="class" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="mincut_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="received_date" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="street_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_cause" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="assigned_to" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_the_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_from_plot" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_appropiate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="notified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="output" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mincut_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="received_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="street_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_cause" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="assigned_to" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_the_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_from_plot" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_appropiate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="notified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="output" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="class" desc="" exp=""/>
-        <constraint field="mincut_type" desc="" exp=""/>
-        <constraint field="received_date" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="expl_name" desc="" exp=""/>
-        <constraint field="macroexpl_name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="muni_name" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="street_name" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="anl_cause" desc="" exp=""/>
-        <constraint field="anl_tstamp" desc="" exp=""/>
-        <constraint field="anl_user" desc="" exp=""/>
-        <constraint field="anl_descript" desc="" exp=""/>
-        <constraint field="anl_feature_id" desc="" exp=""/>
-        <constraint field="anl_feature_type" desc="" exp=""/>
-        <constraint field="forecast_start" desc="" exp=""/>
-        <constraint field="forecast_end" desc="" exp=""/>
-        <constraint field="assigned_to" desc="" exp=""/>
-        <constraint field="exec_start" desc="" exp=""/>
-        <constraint field="exec_end" desc="" exp=""/>
-        <constraint field="exec_user" desc="" exp=""/>
-        <constraint field="exec_descript" desc="" exp=""/>
-        <constraint field="exec_the_geom" desc="" exp=""/>
-        <constraint field="exec_from_plot" desc="" exp=""/>
-        <constraint field="exec_depth" desc="" exp=""/>
-        <constraint field="exec_appropiate" desc="" exp=""/>
-        <constraint field="notified" desc="" exp=""/>
-        <constraint field="output" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="mincut_type" desc=""/>
+        <constraint exp="" field="received_date" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="expl_name" desc=""/>
+        <constraint exp="" field="macroexpl_name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="muni_name" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="street_name" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="anl_cause" desc=""/>
+        <constraint exp="" field="anl_tstamp" desc=""/>
+        <constraint exp="" field="anl_user" desc=""/>
+        <constraint exp="" field="anl_descript" desc=""/>
+        <constraint exp="" field="anl_feature_id" desc=""/>
+        <constraint exp="" field="anl_feature_type" desc=""/>
+        <constraint exp="" field="forecast_start" desc=""/>
+        <constraint exp="" field="forecast_end" desc=""/>
+        <constraint exp="" field="assigned_to" desc=""/>
+        <constraint exp="" field="exec_start" desc=""/>
+        <constraint exp="" field="exec_end" desc=""/>
+        <constraint exp="" field="exec_user" desc=""/>
+        <constraint exp="" field="exec_descript" desc=""/>
+        <constraint exp="" field="exec_the_geom" desc=""/>
+        <constraint exp="" field="exec_from_plot" desc=""/>
+        <constraint exp="" field="exec_depth" desc=""/>
+        <constraint exp="" field="exec_appropiate" desc=""/>
+        <constraint exp="" field="notified" desc=""/>
+        <constraint exp="" field="output" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="class" hidden="0" width="-1" type="field"/>
-          <column name="mincut_type" hidden="0" width="-1" type="field"/>
-          <column name="received_date" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_name" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="street_name" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="anl_cause" hidden="0" width="-1" type="field"/>
-          <column name="anl_tstamp" hidden="0" width="-1" type="field"/>
-          <column name="anl_user" hidden="0" width="-1" type="field"/>
-          <column name="anl_descript" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_id" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_type" hidden="0" width="-1" type="field"/>
-          <column name="forecast_start" hidden="0" width="-1" type="field"/>
-          <column name="forecast_end" hidden="0" width="-1" type="field"/>
-          <column name="assigned_to" hidden="0" width="-1" type="field"/>
-          <column name="exec_start" hidden="0" width="-1" type="field"/>
-          <column name="exec_end" hidden="0" width="-1" type="field"/>
-          <column name="exec_user" hidden="0" width="-1" type="field"/>
-          <column name="exec_descript" hidden="0" width="-1" type="field"/>
-          <column name="exec_the_geom" hidden="0" width="-1" type="field"/>
-          <column name="exec_from_plot" hidden="0" width="-1" type="field"/>
-          <column name="exec_depth" hidden="0" width="-1" type="field"/>
-          <column name="exec_appropiate" hidden="0" width="-1" type="field"/>
-          <column name="notified" hidden="0" width="-1" type="field"/>
-          <column name="output" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="mincut_type"/>
+          <column type="field" width="-1" hidden="0" name="received_date"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_name"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="street_name"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="anl_cause"/>
+          <column type="field" width="-1" hidden="0" name="anl_tstamp"/>
+          <column type="field" width="-1" hidden="0" name="anl_user"/>
+          <column type="field" width="-1" hidden="0" name="anl_descript"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_id"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_type"/>
+          <column type="field" width="-1" hidden="0" name="forecast_start"/>
+          <column type="field" width="-1" hidden="0" name="forecast_end"/>
+          <column type="field" width="-1" hidden="0" name="assigned_to"/>
+          <column type="field" width="-1" hidden="0" name="exec_start"/>
+          <column type="field" width="-1" hidden="0" name="exec_end"/>
+          <column type="field" width="-1" hidden="0" name="exec_user"/>
+          <column type="field" width="-1" hidden="0" name="exec_descript"/>
+          <column type="field" width="-1" hidden="0" name="exec_the_geom"/>
+          <column type="field" width="-1" hidden="0" name="exec_from_plot"/>
+          <column type="field" width="-1" hidden="0" name="exec_depth"/>
+          <column type="field" width="-1" hidden="0" name="exec_appropiate"/>
+          <column type="field" width="-1" hidden="0" name="notified"/>
+          <column type="field" width="-1" hidden="0" name="output"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14695,41 +14898,41 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="anl_cause"/>
-        <field editable="1" name="anl_descript"/>
-        <field editable="1" name="anl_feature_id"/>
-        <field editable="1" name="anl_feature_type"/>
-        <field editable="1" name="anl_tstamp"/>
-        <field editable="1" name="anl_user"/>
-        <field editable="1" name="assigned_to"/>
-        <field editable="1" name="class"/>
-        <field editable="1" name="exec_appropiate"/>
-        <field editable="1" name="exec_depth"/>
-        <field editable="1" name="exec_descript"/>
-        <field editable="1" name="exec_end"/>
-        <field editable="1" name="exec_from_plot"/>
-        <field editable="1" name="exec_start"/>
-        <field editable="1" name="exec_the_geom"/>
-        <field editable="1" name="exec_user"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="expl_name"/>
-        <field editable="1" name="forecast_end"/>
-        <field editable="1" name="forecast_start"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macroexpl_name"/>
-        <field editable="1" name="mincut_type"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="muni_name"/>
-        <field editable="1" name="notified"/>
-        <field editable="1" name="output"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="received_date"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="street_name"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="anl_cause" editable="1"/>
+        <field name="anl_descript" editable="1"/>
+        <field name="anl_feature_id" editable="1"/>
+        <field name="anl_feature_type" editable="1"/>
+        <field name="anl_tstamp" editable="1"/>
+        <field name="anl_user" editable="1"/>
+        <field name="assigned_to" editable="1"/>
+        <field name="class" editable="1"/>
+        <field name="exec_appropiate" editable="1"/>
+        <field name="exec_depth" editable="1"/>
+        <field name="exec_descript" editable="1"/>
+        <field name="exec_end" editable="1"/>
+        <field name="exec_from_plot" editable="1"/>
+        <field name="exec_start" editable="1"/>
+        <field name="exec_the_geom" editable="1"/>
+        <field name="exec_user" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="expl_name" editable="1"/>
+        <field name="forecast_end" editable="1"/>
+        <field name="forecast_start" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macroexpl_name" editable="1"/>
+        <field name="mincut_type" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="muni_name" editable="1"/>
+        <field name="notified" editable="1"/>
+        <field name="output" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="received_date" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="street_name" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="anl_cause"/>
@@ -14772,9 +14975,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>expl_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14825,7 +15034,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -14849,33 +15058,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="176,123,103,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="102,46,25,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="176,123,103,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="102,46,25,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14893,21 +15102,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14958,38 +15167,38 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15021,11 +15230,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="connec_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -15038,9 +15247,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -15091,7 +15306,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15115,33 +15330,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="241,209,66,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="160,134,17,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="241,209,66,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="160,134,17,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15159,21 +15374,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15216,34 +15431,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15275,10 +15490,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -15290,9 +15505,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -15343,7 +15564,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15367,97 +15588,97 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="proposed" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="proposed" symbollevels="0">
         <categories>
-          <category render="true" label="Proposed to close" value="true" symbol="0"/>
-          <category render="true" label="Do not operate" value="false" symbol="1"/>
+          <category render="true" value="true" label="Proposed to close" symbol="0"/>
+          <category render="true" value="false" label="Do not operate" symbol="1"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,55,58,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="134,13,13,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,55,58,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="134,13,13,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="51,160,44,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="6,94,0,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="51,160,44,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="6,94,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="232,113,141,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="232,113,141,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15475,21 +15696,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15564,50 +15785,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="closed" applyOnUpdate="0" expression=""/>
-        <default field="broken" applyOnUpdate="0" expression=""/>
-        <default field="unaccess" applyOnUpdate="0" expression=""/>
-        <default field="proposed" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="unaccess" expression=""/>
+        <default applyOnUpdate="0" field="proposed" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="closed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="broken" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="unaccess" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="proposed" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="unaccess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="proposed" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="closed" desc="" exp=""/>
-        <constraint field="broken" desc="" exp=""/>
-        <constraint field="unaccess" desc="" exp=""/>
-        <constraint field="proposed" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="unaccess" desc=""/>
+        <constraint exp="" field="proposed" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="closed" hidden="0" width="-1" type="field"/>
-          <column name="broken" hidden="0" width="-1" type="field"/>
-          <column name="unaccess" hidden="0" width="-1" type="field"/>
-          <column name="proposed" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="unaccess"/>
+          <column type="field" width="-1" hidden="0" name="proposed"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15639,14 +15860,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="broken"/>
-        <field editable="1" name="closed"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="proposed"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="unaccess"/>
-        <field editable="1" name="work_order"/>
+        <field name="broken" editable="1"/>
+        <field name="closed" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="proposed" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="unaccess" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="broken"/>
@@ -15662,7 +15883,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15721,7 +15942,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15745,26 +15966,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15782,27 +16003,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -15829,26 +16050,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15880,8 +16101,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="connec_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -15891,7 +16112,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15950,7 +16171,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15974,26 +16195,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16011,27 +16232,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -16058,26 +16279,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16109,8 +16330,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -16120,7 +16341,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -16179,7 +16400,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -16203,26 +16424,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16240,27 +16461,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -16287,26 +16508,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16338,8 +16559,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -16386,14 +16607,14 @@ def my_form_open(dialog, layer, feature):
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -17084,63 +17305,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="composer_plan" units="mm" worldFileMap="" printResolution="300">
-      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
-      <Grid offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" referencePoint="0" groupUuid="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" blendMode="0" position="0,0,mm" zValue="0" frameJoinStyle="miter" visibility="1" id="" size="210,297,mm" positionOnPage="0,0,mm" itemRotation="0" background="true">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17148,446 +17369,446 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" svgBorderWidth="0.2" frame="false" anchorPoint="0" pictureWidth="8.01076" excludeFromExports="0" svgBorderColor="0,0,0,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" pictureRotation="0" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" resizeMode="0" blendMode="0" position="21.2488,12.0899,mm" zValue="34" pictureHeight="8.05991" frameJoinStyle="miter" mapUuid="" visibility="1" svgFillColor="255,255,255,255" id="" size="52.9371,8.05991,mm" northMode="0" positionOnPage="21.2488,12.0899,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" labelText="Planified network:  [% &quot;plan_length&quot; %] m." halign="1" blendMode="0" position="18.5098,248.929,mm" zValue="34" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,248.929,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" labelText="Affected network:  [% &quot;affec_length&quot; %] m." halign="1" blendMode="0" position="18.5098,240.85,mm" zValue="33" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,240.85,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" halign="2" blendMode="0" position="130.06,170.278,mm" zValue="32" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="130.06,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" halign="2" blendMode="0" position="129.892,162.595,mm" zValue="31" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.892,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" halign="2" blendMode="0" position="129.892,154.849,mm" zValue="30" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.892,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" blendMode="0" position="18.5119,237.417,mm" zValue="29" frameJoinStyle="miter" visibility="1" id="" size="107.352,0.232607,mm" positionOnPage="18.5119,237.417,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" labelText="Total cost of other works:" halign="1" blendMode="0" position="18.472,170.278,mm" zValue="28" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.07458,mm" positionOnPage="18.472,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" blendMode="0" position="18.472,180.075,mm" zValue="27" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,180.075,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,191.26,mm" zValue="26" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.798,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,184.169,mm" zValue="25" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.798,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" halign="1" blendMode="0" position="18.5098,144.841,mm" zValue="24" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="97.7075,5.87319,mm" positionOnPage="18.5098,144.841,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" labelText="Total cost for node elements:" halign="1" blendMode="0" position="18.472,162.595,mm" zValue="23" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.87319,mm" positionOnPage="18.472,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" blendMode="0" position="18.4712,202.127,mm" zValue="22" frameJoinStyle="miter" visibility="1" id="" size="178.105,0.232607,mm" positionOnPage="18.4712,202.127,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" blendMode="0" position="18.472,149.994,mm" zValue="21" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,149.994,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" blendMode="0" position="17.1613,8.922,mm" zValue="19" frameJoinStyle="miter" visibility="1" id="" size="0.851544,16.1039,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" blendMode="0" position="17.1613,8.922,mm" zValue="18" frameJoinStyle="miter" visibility="1" id="" size="179.415,0.863719,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="true" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" mapFlags="0" blendMode="0" position="131.014,237.517,mm" zValue="17" frameJoinStyle="miter" visibility="1" followPreset="false" id="" size="65.4621,46.5539,mm" keepLayerSet="true" positionOnPage="131.014,237.517,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4577071.35527538601309061" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymin="4576100.62452332023531199"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" layerid="ext_municipality20171204170633784">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -17747,66 +17968,66 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="muni_id" name="" index="0"/>
-                <alias field="name" name="" index="1"/>
-                <alias field="observ" name="" index="2"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="name" hidden="0" width="183" type="field"/>
-                  <column name="observ" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -17838,442 +18059,442 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="muni_id" expression=""/>
-                <default field="name" expression=""/>
-                <default field="observ" expression=""/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="name"/>
+                <default expression="" field="observ"/>
               </defaults>
               <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_dimensions20170628134034849">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-                  <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-                  <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol name="@2@1" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@2@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol name="@2@3" alpha="1" clip_to_extent="1" type="fill">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleFill">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol name="@2@4" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -18282,143 +18503,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule scalemindenom="1" key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -18578,88 +18799,88 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="distance" name="" index="1"/>
-                <alias field="depth" name="" index="2"/>
-                <alias field="x_label" name="" index="3"/>
-                <alias field="y_label" name="" index="4"/>
-                <alias field="rotation_label" name="" index="5"/>
-                <alias field="offset_label" name="" index="6"/>
-                <alias field="direction_arrow" name="" index="7"/>
-                <alias field="x_symbol" name="" index="8"/>
-                <alias field="y_symbol" name="" index="9"/>
-                <alias field="feature_id" name="" index="10"/>
-                <alias field="feature_type" name="" index="11"/>
-                <alias field="state" name="" index="12"/>
-                <alias field="expl_id" name="" index="13"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+              <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="distance" hidden="0" width="-1" type="field"/>
-                  <column name="depth" hidden="0" width="-1" type="field"/>
-                  <column name="x_label" hidden="0" width="-1" type="field"/>
-                  <column name="y_label" hidden="0" width="-1" type="field"/>
-                  <column name="rotation_label" hidden="0" width="-1" type="field"/>
-                  <column name="offset_label" hidden="0" width="-1" type="field"/>
-                  <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-                  <column name="x_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="y_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="feature_id" hidden="0" width="-1" type="field"/>
-                  <column name="feature_type" hidden="0" width="-1" type="field"/>
-                  <column name="state" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -18691,151 +18912,151 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="distance" expression=""/>
-                <default field="depth" expression=""/>
-                <default field="x_label" expression=""/>
-                <default field="y_label" expression=""/>
-                <default field="rotation_label" expression=""/>
-                <default field="offset_label" expression=""/>
-                <default field="direction_arrow" expression=""/>
-                <default field="x_symbol" expression=""/>
-                <default field="y_symbol" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="feature_type" expression=""/>
-                <default field="state" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="distance"/>
+                <default expression="" field="depth"/>
+                <default expression="" field="x_label"/>
+                <default expression="" field="y_label"/>
+                <default expression="" field="rotation_label"/>
+                <default expression="" field="offset_label"/>
+                <default expression="" field="direction_arrow"/>
+                <default expression="" field="x_symbol"/>
+                <default expression="" field="y_symbol"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="feature_type"/>
+                <default expression="" field="state"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_samplepoint20170619120830016">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="dma_id" notNull="0" Layer="v_edit_dma20180201085045064" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_state20160216123517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="muni_id" notNull="0" Layer="ext_municipality20171204170633784" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="ext_streetaxis20160528211138508" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="postnumber" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="postnumber" notNull="0" Layer="ext_address20171204171433160" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_verified20160216164517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="expl_id" notNull="0" Layer="exploitation20180122152954062" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                     <layer locked="0" pass="0" class="FontMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -18995,85 +19216,85 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer classificationAttributeExpression="" upperValue="0" attributeLegend="1" upperHeight="50" lowerValue="0" diagramType="Histogram" lowerWidth="0" upperWidth="50" sizeLegend="0" lowerHeight="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="sample_id" name="" index="0"/>
-                <alias field="code" name="" index="1"/>
-                <alias field="lab_code" name="" index="2"/>
-                <alias field="feature_id" name="" index="3"/>
-                <alias field="featurecat_id" name="" index="4"/>
-                <alias field="dma_id" name="" index="5"/>
-                <alias field="macrodma_id" name="" index="6"/>
-                <alias field="presszonecat_id" name="" index="7"/>
-                <alias field="state" name="" index="8"/>
-                <alias field="builtdate" name="" index="9"/>
-                <alias field="enddate" name="" index="10"/>
-                <alias field="workcat_id" name="" index="11"/>
-                <alias field="workcat_id_end" name="" index="12"/>
-                <alias field="rotation" name="" index="13"/>
-                <alias field="muni_id" name="" index="14"/>
-                <alias field="streetaxis_id" name="" index="15"/>
-                <alias field="postnumber" name="" index="16"/>
-                <alias field="postcode" name="" index="17"/>
-                <alias field="streetaxis2_id" name="" index="18"/>
-                <alias field="postnumber2" name="" index="19"/>
-                <alias field="postcomplement" name="" index="20"/>
-                <alias field="postcomplement2" name="" index="21"/>
-                <alias field="place_name" name="" index="22"/>
-                <alias field="cabinet" name="" index="23"/>
-                <alias field="observations" name="" index="24"/>
-                <alias field="verified" name="" index="25"/>
-                <alias field="expl_id" name="" index="26"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -19105,85 +19326,85 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="sample_id" expression=""/>
-                <default field="code" expression=""/>
-                <default field="lab_code" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="featurecat_id" expression=""/>
-                <default field="dma_id" expression=""/>
-                <default field="macrodma_id" expression=""/>
-                <default field="presszonecat_id" expression=""/>
-                <default field="state" expression=""/>
-                <default field="builtdate" expression=""/>
-                <default field="enddate" expression=""/>
-                <default field="workcat_id" expression=""/>
-                <default field="workcat_id_end" expression=""/>
-                <default field="rotation" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis2_id" expression=""/>
-                <default field="postnumber2" expression=""/>
-                <default field="postcomplement" expression=""/>
-                <default field="postcomplement2" expression=""/>
-                <default field="place_name" expression=""/>
-                <default field="cabinet" expression=""/>
-                <default field="observations" expression=""/>
-                <default field="verified" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="sample_id"/>
+                <default expression="" field="code"/>
+                <default expression="" field="lab_code"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="featurecat_id"/>
+                <default expression="" field="dma_id"/>
+                <default expression="" field="macrodma_id"/>
+                <default expression="" field="presszonecat_id"/>
+                <default expression="" field="state"/>
+                <default expression="" field="builtdate"/>
+                <default expression="" field="enddate"/>
+                <default expression="" field="workcat_id"/>
+                <default expression="" field="workcat_id_end"/>
+                <default expression="" field="rotation"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis2_id"/>
+                <default expression="" field="postnumber2"/>
+                <default expression="" field="postcomplement"/>
+                <default expression="" field="postcomplement2"/>
+                <default expression="" field="place_name"/>
+                <default expression="" field="cabinet"/>
+                <default expression="" field="observations"/>
+                <default expression="" field="verified"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_address20180201103159332">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -19342,74 +19563,74 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="muni_id" name="" index="1"/>
-                <alias field="postcode" name="" index="2"/>
-                <alias field="streetaxis_id" name="" index="3"/>
-                <alias field="postnumber" name="" index="4"/>
-                <alias field="plot_id" name="" index="5"/>
-                <alias field="expl_id" name="" index="6"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="postcode" hidden="0" width="-1" type="field"/>
-                  <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-                  <column name="postnumber" hidden="0" width="-1" type="field"/>
-                  <column name="plot_id" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -19441,73 +19662,73 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="plot_id" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="plot_id"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_plot20180201103159443">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -19666,70 +19887,70 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="plot_code" name="" index="1"/>
-                <alias field="muni_id" name="" index="2"/>
-                <alias field="postcode" name="" index="3"/>
-                <alias field="streetaxis_id" name="" index="4"/>
-                <alias field="postnumber" name="" index="5"/>
-                <alias field="complement" name="" index="6"/>
-                <alias field="placement" name="" index="7"/>
-                <alias field="square" name="" index="8"/>
-                <alias field="observ" name="" index="9"/>
-                <alias field="text" name="" index="10"/>
-                <alias field="expl_id" name="" index="11"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -19761,116 +19982,116 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="plot_code" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="complement" expression=""/>
-                <default field="placement" expression=""/>
-                <default field="square" expression=""/>
-                <default field="observ" expression=""/>
-                <default field="text" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="plot_code"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="complement"/>
+                <default expression="" field="placement"/>
+                <default expression="" field="square"/>
+                <default expression="" field="observ"/>
+                <default expression="" field="text"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression/>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" name="Vista general 1" position="3" frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" blendMode="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" centered="0">
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19878,9 +20099,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -19889,399 +20110,399 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{04100234-7357-49e1-9d15-b7949d417719}" blendMode="0" position="17.1613,22.2695,mm" zValue="16" frameJoinStyle="miter" visibility="1" id="" size="179.415,2.75637,mm" positionOnPage="17.1613,22.2695,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" labelText="[% &quot;observ&quot; %]" halign="1" blendMode="0" position="40.013,223.173,mm" zValue="15" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="149.138,11.1067,mm" positionOnPage="40.013,223.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" labelText="[% &quot;descript&quot; %]" halign="1" blendMode="0" position="37.635,212.191,mm" zValue="14" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="153.454,10.5555,mm" positionOnPage="37.635,212.191,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" halign="1" blendMode="0" position="18.472,191.26,mm" zValue="13" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="77.862,4.52331,mm" positionOnPage="18.472,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" labelText="Observations:" halign="1" blendMode="0" position="18.2394,224.173,mm" zValue="12" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="24.3323,3.60837,mm" positionOnPage="18.2394,224.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" halign="1" blendMode="0" position="18.472,184.169,mm" zValue="11" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,5.87319,mm" positionOnPage="18.472,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" svgBorderWidth="0" frame="false" anchorPoint="0" pictureWidth="5.27855" excludeFromExports="0" svgBorderColor="255,255,255,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" pictureRotation="90" file="arrows/NorthArrow_10.svg" resizeMode="0" blendMode="0" position="186.801,128.951,mm" zValue="10" pictureHeight="6.83615" frameJoinStyle="miter" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" visibility="1" svgFillColor="0,0,0,255" id="compass" size="6.83615,6.83615,mm" northMode="0" positionOnPage="186.801,128.951,mm" itemRotation="0" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="128" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" labelText="Total cost for arc elements:" halign="1" blendMode="0" position="18.472,154.849,mm" zValue="9" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="53.284,5.87319,mm" positionOnPage="18.472,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" labelText="Description:" halign="1" blendMode="0" position="18.4712,213.104,mm" zValue="8" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="20.5677,5.87319,mm" positionOnPage="18.4712,213.104,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" labelText="Priority:  [% &quot;priority&quot; %]" halign="1" blendMode="0" position="18.4712,206.23,mm" zValue="7" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="96.1108,5.87319,mm" positionOnPage="18.4712,206.23,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" blendMode="0" position="17.603,287.775,mm" zValue="6" frameJoinStyle="miter" visibility="1" id="" size="179.614,0.746,mm" positionOnPage="17.603,287.775,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1" frame="false" sectionHeight="6.16796" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" sectionX="0" blendMode="0" position="62.9048,188.347,mm" zValue="5" frameJoinStyle="miter" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,6.16796,mm" positionOnPage="62.9048,188.347,mm" itemRotation="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1" frame="false" sectionHeight="5.9" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" sectionX="0" blendMode="0" position="62.9048,182.447,mm" zValue="4" frameJoinStyle="miter" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,5.9,mm" positionOnPage="62.9048,182.447,mm" itemRotation="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" blendMode="0" position="17.7113,33.9068,mm" zValue="3" frameJoinStyle="miter" visibility="1" id="" size="178.865,0.746323,mm" positionOnPage="17.7113,33.9068,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1" frame="true" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" labelText="" halign="4" blendMode="0" position="85.0548,26.9871,mm" zValue="2" marginX="0" frameJoinStyle="miter" visibility="1" id="title" htmlState="0" valign="32" size="49.4242,4.61973,mm" positionOnPage="85.0548,26.9871,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="false" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" mapFlags="0" blendMode="0" position="18.572,40.2423,mm" zValue="1" frameJoinStyle="miter" visibility="1" followPreset="false" id="map" size="177.676,98.3225,mm" keepLayerSet="false" positionOnPage="18.572,40.2423,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapAtlasMargin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapAtlasMargin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;rotation&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;scale&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4576677.90777442045509815" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymin="4576604.16589934565126896"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -20290,198 +20511,198 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.2" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.5" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" sortAscending="1" featureFilter=" &quot;psector_id&quot; " filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="1" sortFeatures="1" pageNameExpression="" enabled="0" sortKey="psector_id"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>
diff --git a/templates/qgisproject/en/ws_epa.qgs b/templates/qgisproject/en/ws_epa.qgs
index 7b893d46c..57695939e 100644
--- a/templates/qgisproject/en/ws_epa.qgs
+++ b/templates/qgisproject/en/ws_epa.qgs
@@ -20,277 +20,277 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="O&amp;M" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="O&amp;M">
       <customproperties/>
-      <layer-tree-layer name="Visits" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_om_visit20180201113951439" providerKey="postgres">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_om_visit20180201113951439" name="Visits" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group name="Mincut analysis" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Mincut analysis">
         <customproperties/>
-        <layer-tree-layer name="Mincut init point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" name="Mincut init point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" name="Mincut result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" name="Mincut result connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="INVENTORY" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group name="Map zones" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer name="Exploitation" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dma" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dma20190515092620863" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_sector20171204170540567" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dqa" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Presszone" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Minsector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Network" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-layer name="Node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Link" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_link20160511142132204" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group name="Polygon GROUP" checked="Qt::Checked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer name="Fountain polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Register polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Tank polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Other" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_dimensions20170628134034849" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Element" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_element20170828122555146" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_samplepoint20170619120830016" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="EDIT" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EDIT">
       <customproperties/>
-      <layer-tree-group name="CAD auxiliar layers" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="CAD auxiliar layers">
         <customproperties/>
-        <layer-tree-layer name="Circle" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" expanded="1" id="v_edit_cad_auxcircle20180403155702431" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" id="v_edit_cad_auxcircle20180403155702431" name="Circle" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" expanded="1" id="v_edit_cad_auxpoint20180403155702690" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" id="v_edit_cad_auxpoint20180403155702690" name="Point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="EPA" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EPA">
       <customproperties/>
-      <layer-tree-group name="Input" checked="Qt::Unchecked" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Input">
         <customproperties/>
-        <layer-tree-group name="Node" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Node">
           <customproperties/>
-          <layer-tree-layer name="Inp reservoir" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" name="Inp reservoir" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp tank" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" name="Inp tank" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp inlet" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" name="Inp inlet" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp junction" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" name="Inp junction" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp mixing" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_mixing20130813215615038" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" checked="Qt::Unchecked" id="inp_mixing20130813215615038" name="Inp mixing" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp emitter" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_emitter20130813215614777" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" checked="Qt::Unchecked" id="inp_emitter20130813215614777" name="Inp emitter" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp source" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_source20130813215615594" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" checked="Qt::Unchecked" id="inp_source20130813215615594" name="Inp source" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Demand scenario" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_inp_demand20180212154336936" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" checked="Qt::Unchecked" id="v_edit_inp_demand20180212154336936" name="Demand scenario" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Arc" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Arc">
           <customproperties/>
-          <layer-tree-layer name="Inp virtualvalve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" name="Inp virtualvalve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp shortpipe" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" name="Inp shortpipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" name="Inp valve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp pump" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" name="Inp pump" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp pipe" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" name="Inp pipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Pump additional" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_pump_additional20171218122636750" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" checked="Qt::Unchecked" id="inp_pump_additional20171218122636750" name="Pump additional" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Connec" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Connec">
           <customproperties/>
-          <layer-tree-layer name="Inp connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" name="Inp connec" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Controls &amp; Rules" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Controls &amp; Rules">
           <customproperties/>
-          <layer-tree-layer name="Controls arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_controls_x_arc20180109103020152" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_controls_x_arc20180109103020152" name="Controls arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Rules arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_rules_x_arc20180109103020214" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_arc20180109103020214" name="Rules arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Rules node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_rules_x_node20180109103020245" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_node20180109103020245" name="Rules node" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Curves &amp; Patterns" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Curves &amp; Patterns">
           <customproperties/>
-          <layer-tree-layer name="Curve catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" checked="Qt::Checked" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" name="Curve catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Curve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" checked="Qt::Checked" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" name="Curve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Patterns catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_pattern20130813215615249" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" checked="Qt::Unchecked" id="inp_pattern20130813215615249" name="Patterns catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Pattern" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_pattern_value20180109135221371" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" checked="Qt::Unchecked" id="inp_pattern_value20180109135221371" name="Pattern" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Quality &amp; Energy" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Quality &amp; Energy">
           <customproperties/>
-          <layer-tree-layer name="Energy" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" checked="Qt::Checked" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" name="Energy" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Reactions" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" checked="Qt::Checked" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" name="Reactions" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Quality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_quality20130813215615383" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" checked="Qt::Unchecked" id="inp_quality20130813215615383" name="Quality" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Output" checked="Qt::Unchecked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Output">
         <customproperties/>
-        <layer-tree-group name="Result" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Result">
           <customproperties/>
-          <layer-tree-layer name="Node hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_node_hourly20180309112715024" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_hourly20180309112715024" name="Node hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node minimum values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_node20180206173632034" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node20180206173632034" name="Node minimum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node maximum values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="Node_minimum_values_copy20180206174011431" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="Node_minimum_values_copy20180206174011431" name="Node maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node all values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_node_all20180309112714890" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_all20180309112714890" name="Node all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_arc_hourly20180309112714378" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_hourly20180309112714378" name="Arc hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc maximum values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_arc20180206173632206" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc20180206173632206" name="Arc maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc all values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_arc_all20180309112714512" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_all20180309112714512" name="Arc all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Energy usage" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_energy_usage20180201122650430" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_energy_usage20180201122650430" name="Energy usage" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Hydraulic status" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_hydraulic_status20131203141738132" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_hydraulic_status20131203141738132" name="Hydraulic status" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Compare result" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Compare result">
           <customproperties/>
-          <layer-tree-layer name="Node compare hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_comp_node_hourly20180309112714764" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_hourly20180309112714764" name="Node compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node minimum values compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_node20160710012004695" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node20160710012004695" name="Node minimum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node maximum values compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_node_copiar20161230144859228" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_copiar20161230144859228" name="Node maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc compare hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_arc_hourly20180309112714639" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc_hourly20180309112714639" name="Arc compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc maximum values compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_arc20160710012004554" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc20160710012004554" name="Arc maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Energy usage compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_comp_energy_usage20160710012004617" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_energy_usage20160710012004617" name="Energy usage compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Hydraulic status compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_comp_hydraulic_status20160710012004648" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_hydraulic_status20160710012004648" name="Hydraulic status compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="BASEMAP" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group name="Address" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ext_municipality20171204170633784" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_ext_address20180201103159332" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Streetaxis" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_plot20180201103159443" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -349,58 +349,58 @@
       <item>v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" unit="1" enabled="1" type="1" tolerance="15" mode="3">
+  <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting units="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_comp_arc_hourly20180309112714639" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_plot20180201103159443" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_cad_auxpoint20180403155702690" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_node_all20180309112714890" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="v_edit_dimensions20170628134034849" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_edit_dma20190515092620863" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_samplepoint20170619120830016" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_comp_node_copiar20161230144859228" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_sector20171204170540567" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_address20180201103159332" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_rpt_comp_node_hourly20180309112714764" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_rpt_arc_all20180309112714512" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_om_visit20180201113951439" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_link20160511142132204" enabled="1" type="2" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="Node_minimum_values_copy20180206174011431" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_cad_auxcircle20180403155702431" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_node_hourly20180309112715024" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_rpt_arc_hourly20180309112714378" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_element20170828122555146" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_arc20180206173632206" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="ext_municipality20171204170633784" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_rpt_comp_arc20160710012004554" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_node20180206173632034" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_comp_node20160710012004695" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" enabled="0" type="1" tolerance="12"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node20180206173632034" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_om_visit20180201113951439" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_hourly20180309112714764" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc20180206173632206" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_all20180309112714512" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc20160710012004554" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_hourly20180309112715024" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_hourly20180309112714378" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="Node_minimum_values_copy20180206174011431" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node20160710012004695" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc_hourly20180309112714639" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_all20180309112714890" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_copiar20161230144859228" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -431,390 +431,390 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" name="O&amp;M" checked="Qt::Checked">
-      <legendlayer open="true" showFeatureCount="0" name="Visits" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="O&amp;M" open="false">
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Visits" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" layerid="v_edit_om_visit20180201113951439" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="false" name="Mincut analysis" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Mincut init point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Mincut analysis" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut init point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result node" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result connec" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="true" name="INVENTORY" checked="Qt::Checked">
-      <legendgroup open="false" name="Map zones" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Exploitation" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dma" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Sector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dqa" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Presszone" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Minsector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Network" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Arc" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Link" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" name="Polygon GROUP" checked="Qt::Checked">
-          <legendlayer open="true" showFeatureCount="0" name="Fountain polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Register polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Tank polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Other" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Dimensioning" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Element" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Sample point" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="EDIT" checked="Qt::Unchecked">
-      <legendgroup open="false" name="CAD auxiliar layers" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Circle" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="EDIT" open="false">
+      <legendgroup checked="Qt::Checked" name="CAD auxiliar layers" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Circle" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="EPA" checked="Qt::Unchecked">
-      <legendgroup open="true" name="Input" checked="Qt::Unchecked">
-        <legendgroup open="false" name="Node" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Inp reservoir" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="EPA" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Input" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Node" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp reservoir" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp tank" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp tank" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp inlet" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp inlet" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp junction" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp junction" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp mixing" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp mixing" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_mixing20130813215615038" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp emitter" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp emitter" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_emitter20130813215614777" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp source" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp source" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_source20130813215615594" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Demand scenario" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Demand scenario" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_demand20180212154336936" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Arc" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Inp virtualvalve" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Arc" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp virtualvalve" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp shortpipe" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp shortpipe" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp valve" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp valve" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp pump" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pump" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp pipe" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pipe" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Pump additional" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pump additional" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_pump_additional20171218122636750" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Connec" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Inp connec" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Connec" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp connec" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Controls &amp; Rules" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Controls arc" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Controls &amp; Rules" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Controls arc" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_controls_x_arc20180109103020152" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Rules arc" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules arc" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_rules_x_arc20180109103020214" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Rules node" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules node" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_rules_x_node20180109103020245" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Curves &amp; Patterns" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Curve catalog" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Curves &amp; Patterns" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve catalog" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Curve" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Patterns catalog" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Patterns catalog" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_pattern20130813215615249" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Pattern" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pattern" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_pattern_value20180109135221371" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Quality &amp; Energy" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Energy" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Quality &amp; Energy" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Energy" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Reactions" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Reactions" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Quality" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Quality" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_quality20130813215615383" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Output" checked="Qt::Unchecked">
-        <legendgroup open="false" name="Result" checked="Qt::Unchecked">
-          <legendlayer open="false" showFeatureCount="0" name="Node hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Unchecked" name="Output" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node hourly values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_node_hourly20180309112715024" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node minimum values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_node20180206173632034" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node maximum values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="Node_minimum_values_copy20180206174011431" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node all values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node all values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_node_all20180309112714890" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc hourly values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_arc_hourly20180309112714378" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc maximum values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_arc20180206173632206" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Arc all values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc all values" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_arc_all20180309112714512" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Energy usage" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_energy_usage20180201122650430" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Hydraulic status" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_hydraulic_status20131203141738132" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Compare result" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Node compare hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Compare result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node compare hourly values" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_comp_node_hourly20180309112714764" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node minimum values compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values compare" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_node20160710012004695" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node maximum values compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_node_copiar20161230144859228" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc compare hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc compare hourly values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_arc_hourly20180309112714639" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc maximum values compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_arc20160710012004554" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Energy usage compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage compare" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_comp_energy_usage20160710012004617" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Hydraulic status compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status compare" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_comp_hydraulic_status20160710012004648" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="BASEMAP" checked="Qt::Checked">
-      <legendgroup open="true" name="Address" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Municipality" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Address" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Streetaxis" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Plot" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
@@ -824,7 +824,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>Node_minimum_values_copy20180206174011431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -884,202 +884,202 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -1087,49 +1087,49 @@
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -1142,27 +1142,27 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1171,8 +1171,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1181,8 +1181,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1191,8 +1191,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1201,8 +1201,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1211,8 +1211,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1221,8 +1221,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1238,8 +1238,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1255,8 +1255,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1272,8 +1272,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1304,64 +1304,64 @@
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1398,7 +1398,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -1457,7 +1457,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -1481,26 +1481,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1518,56 +1518,68 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -1581,34 +1593,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="muni_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="183" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1640,10 +1652,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="observ"/>
+        <field name="active" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="observ" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="active"/>
@@ -1655,7 +1667,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_controls_x_arc20180109103020152</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_controls_x_arc" sql=</datasource>
       <keywordList>
@@ -1716,7 +1728,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1759,31 +1771,31 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1799,19 +1811,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="text"/>
+        <field name="active" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_383cb6c0_4452_42b4_a17d_131cca921196</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -1870,7 +1882,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -1915,28 +1927,28 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="curve_type" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="isdoublen2a" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="isdoublen2a" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_type" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="isdoublen2a" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isdoublen2a" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="curve_type" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="isdoublen2a" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="isdoublen2a" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -1957,9 +1969,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve_value" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve_value" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -2018,7 +2030,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -2063,28 +2075,28 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="x_value" applyOnUpdate="0" expression=""/>
-        <default field="y_value" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="x_value" expression=""/>
+        <default applyOnUpdate="0" field="y_value" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_value" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_value" notnull_strength="1" constraints="1" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="x_value" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="y_value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="x_value" desc="" exp=""/>
-        <constraint field="y_value" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="x_value" desc=""/>
+        <constraint exp="" field="y_value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2105,7 +2117,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_emitter20130813215614777</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_emitter" sql=</datasource>
       <keywordList>
@@ -2166,7 +2178,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2182,8 +2194,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2196,30 +2208,30 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="coef" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="coef" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="coef" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="coef" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="coef" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" notificationMessage="" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="coef" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="coef"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2235,15 +2247,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="coef"/>
-        <field editable="1" name="node_id"/>
+        <field name="coef" editable="1"/>
+        <field name="node_id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_energy" sql=</datasource>
       <keywordList>
@@ -2304,7 +2316,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -2333,26 +2345,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2368,15 +2380,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="id"/>
+        <field name="descript" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_mixing20130813215615038</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_mixing" sql=</datasource>
       <keywordList>
@@ -2403,6 +2415,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -2419,7 +2440,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -2441,7 +2470,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2450,30 +2479,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="mix_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="2COMP" type="QString" value="2COMP"/>
-                  <Option name="FIFO" type="QString" value="FIFO"/>
-                  <Option name="LIFO" type="QString" value="LIFO"/>
-                  <Option name="MIXED" type="QString" value="MIXED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="value">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -2486,34 +2514,35 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="mix_type" applyOnUpdate="0" expression=""/>
-        <default field="value" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="mix_type" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="mix_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="value" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mix_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="mix_type" desc="" exp=""/>
-        <constraint field="value" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="mix_type" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" notificationMessage="" id="{090a6f21-21c8-42f5-9ee2-ac605342a7fa}" type="1" capture="0">
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{48abc25e-d3b4-487c-84ec-7ac39610627f}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="mix_type" hidden="0" width="-1" type="field"/>
-          <column name="value" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="mix_type"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2545,16 +2574,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="mix_type"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="value"/>
+        <field name="mix_type" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="value" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="mix_type"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="value"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern20130813215615249</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern" sql=</datasource>
       <keywordList>
@@ -2607,7 +2640,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -2636,7 +2669,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2645,8 +2678,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2682,40 +2715,40 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="tscode" applyOnUpdate="0" expression=""/>
-        <default field="tsparameters" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="tscode" expression=""/>
+        <default applyOnUpdate="0" field="tsparameters" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pattern_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tscode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tsparameters" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tscode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tsparameters" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="tscode" desc="" exp=""/>
-        <constraint field="tsparameters" desc="" exp=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="tscode" desc=""/>
+        <constraint exp="" field="tsparameters" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" notificationMessage="" id="{5e331a69-33a3-4cac-9657-c86880183ed4}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5e331a69-33a3-4cac-9657-c86880183ed4}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="pattern_type" hidden="0" width="-1" type="field"/>
-          <column name="tscode" hidden="0" width="-1" type="field"/>
-          <column name="tsparameters" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="pattern_type"/>
+          <column type="field" width="-1" hidden="0" name="tscode"/>
+          <column type="field" width="-1" hidden="0" name="tsparameters"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2747,11 +2780,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="pattern_type"/>
-        <field editable="1" name="tscode"/>
-        <field editable="1" name="tsparameters"/>
+        <field name="observ" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="pattern_type" editable="1"/>
+        <field name="tscode" editable="1"/>
+        <field name="tsparameters" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="observ"/>
@@ -2764,7 +2797,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("pattern_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern_value20180109135221371</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern_value" sql=</datasource>
       <keywordList>
@@ -2791,6 +2824,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -2807,7 +2849,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -2829,161 +2879,188 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_3">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_4">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_5">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_6">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_7">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_8">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_9">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_10">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_11">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_12">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_13">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_14">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_15">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_16">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_17">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_18">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -3015,104 +3092,98 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="factor_1" applyOnUpdate="0" expression=""/>
-        <default field="factor_2" applyOnUpdate="0" expression=""/>
-        <default field="factor_3" applyOnUpdate="0" expression=""/>
-        <default field="factor_4" applyOnUpdate="0" expression=""/>
-        <default field="factor_5" applyOnUpdate="0" expression=""/>
-        <default field="factor_6" applyOnUpdate="0" expression=""/>
-        <default field="factor_7" applyOnUpdate="0" expression=""/>
-        <default field="factor_8" applyOnUpdate="0" expression=""/>
-        <default field="factor_9" applyOnUpdate="0" expression=""/>
-        <default field="factor_10" applyOnUpdate="0" expression=""/>
-        <default field="factor_11" applyOnUpdate="0" expression=""/>
-        <default field="factor_12" applyOnUpdate="0" expression=""/>
-        <default field="factor_13" applyOnUpdate="0" expression=""/>
-        <default field="factor_14" applyOnUpdate="0" expression=""/>
-        <default field="factor_15" applyOnUpdate="0" expression=""/>
-        <default field="factor_16" applyOnUpdate="0" expression=""/>
-        <default field="factor_17" applyOnUpdate="0" expression=""/>
-        <default field="factor_18" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="factor_1" expression=""/>
+        <default applyOnUpdate="0" field="factor_2" expression=""/>
+        <default applyOnUpdate="0" field="factor_3" expression=""/>
+        <default applyOnUpdate="0" field="factor_4" expression=""/>
+        <default applyOnUpdate="0" field="factor_5" expression=""/>
+        <default applyOnUpdate="0" field="factor_6" expression=""/>
+        <default applyOnUpdate="0" field="factor_7" expression=""/>
+        <default applyOnUpdate="0" field="factor_8" expression=""/>
+        <default applyOnUpdate="0" field="factor_9" expression=""/>
+        <default applyOnUpdate="0" field="factor_10" expression=""/>
+        <default applyOnUpdate="0" field="factor_11" expression=""/>
+        <default applyOnUpdate="0" field="factor_12" expression=""/>
+        <default applyOnUpdate="0" field="factor_13" expression=""/>
+        <default applyOnUpdate="0" field="factor_14" expression=""/>
+        <default applyOnUpdate="0" field="factor_15" expression=""/>
+        <default applyOnUpdate="0" field="factor_16" expression=""/>
+        <default applyOnUpdate="0" field="factor_17" expression=""/>
+        <default applyOnUpdate="0" field="factor_18" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_3" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_4" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_5" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_6" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_7" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_8" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_9" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_10" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_11" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_12" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_13" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_14" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_15" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_16" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_17" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_18" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_3" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_4" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_5" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_6" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_7" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_8" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_9" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_10" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_11" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_12" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_13" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_14" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_15" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_16" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_17" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_18" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="factor_1" desc="" exp=""/>
-        <constraint field="factor_2" desc="" exp=""/>
-        <constraint field="factor_3" desc="" exp=""/>
-        <constraint field="factor_4" desc="" exp=""/>
-        <constraint field="factor_5" desc="" exp=""/>
-        <constraint field="factor_6" desc="" exp=""/>
-        <constraint field="factor_7" desc="" exp=""/>
-        <constraint field="factor_8" desc="" exp=""/>
-        <constraint field="factor_9" desc="" exp=""/>
-        <constraint field="factor_10" desc="" exp=""/>
-        <constraint field="factor_11" desc="" exp=""/>
-        <constraint field="factor_12" desc="" exp=""/>
-        <constraint field="factor_13" desc="" exp=""/>
-        <constraint field="factor_14" desc="" exp=""/>
-        <constraint field="factor_15" desc="" exp=""/>
-        <constraint field="factor_16" desc="" exp=""/>
-        <constraint field="factor_17" desc="" exp=""/>
-        <constraint field="factor_18" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="factor_1" desc=""/>
+        <constraint exp="" field="factor_2" desc=""/>
+        <constraint exp="" field="factor_3" desc=""/>
+        <constraint exp="" field="factor_4" desc=""/>
+        <constraint exp="" field="factor_5" desc=""/>
+        <constraint exp="" field="factor_6" desc=""/>
+        <constraint exp="" field="factor_7" desc=""/>
+        <constraint exp="" field="factor_8" desc=""/>
+        <constraint exp="" field="factor_9" desc=""/>
+        <constraint exp="" field="factor_10" desc=""/>
+        <constraint exp="" field="factor_11" desc=""/>
+        <constraint exp="" field="factor_12" desc=""/>
+        <constraint exp="" field="factor_13" desc=""/>
+        <constraint exp="" field="factor_14" desc=""/>
+        <constraint exp="" field="factor_15" desc=""/>
+        <constraint exp="" field="factor_16" desc=""/>
+        <constraint exp="" field="factor_17" desc=""/>
+        <constraint exp="" field="factor_18" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="factor_1" hidden="0" width="-1" type="field"/>
-          <column name="factor_2" hidden="0" width="-1" type="field"/>
-          <column name="factor_3" hidden="0" width="-1" type="field"/>
-          <column name="factor_4" hidden="0" width="-1" type="field"/>
-          <column name="factor_5" hidden="0" width="-1" type="field"/>
-          <column name="factor_6" hidden="0" width="-1" type="field"/>
-          <column name="factor_7" hidden="0" width="-1" type="field"/>
-          <column name="factor_8" hidden="0" width="-1" type="field"/>
-          <column name="factor_9" hidden="0" width="-1" type="field"/>
-          <column name="factor_10" hidden="0" width="-1" type="field"/>
-          <column name="factor_11" hidden="0" width="-1" type="field"/>
-          <column name="factor_12" hidden="0" width="-1" type="field"/>
-          <column name="factor_13" hidden="0" width="-1" type="field"/>
-          <column name="factor_14" hidden="0" width="-1" type="field"/>
-          <column name="factor_15" hidden="0" width="-1" type="field"/>
-          <column name="factor_16" hidden="0" width="-1" type="field"/>
-          <column name="factor_17" hidden="0" width="-1" type="field"/>
-          <column name="factor_18" hidden="0" width="-1" type="field"/>
-          <column name="factor_19" hidden="0" width="-1" type="field"/>
-          <column name="factor_20" hidden="0" width="-1" type="field"/>
-          <column name="factor_21" hidden="0" width="-1" type="field"/>
-          <column name="factor_22" hidden="0" width="-1" type="field"/>
-          <column name="factor_23" hidden="0" width="-1" type="field"/>
-          <column name="factor_24" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="factor_1"/>
+          <column type="field" width="-1" hidden="0" name="factor_2"/>
+          <column type="field" width="-1" hidden="0" name="factor_3"/>
+          <column type="field" width="-1" hidden="0" name="factor_4"/>
+          <column type="field" width="-1" hidden="0" name="factor_5"/>
+          <column type="field" width="-1" hidden="0" name="factor_6"/>
+          <column type="field" width="-1" hidden="0" name="factor_7"/>
+          <column type="field" width="-1" hidden="0" name="factor_8"/>
+          <column type="field" width="-1" hidden="0" name="factor_9"/>
+          <column type="field" width="-1" hidden="0" name="factor_10"/>
+          <column type="field" width="-1" hidden="0" name="factor_11"/>
+          <column type="field" width="-1" hidden="0" name="factor_12"/>
+          <column type="field" width="-1" hidden="0" name="factor_13"/>
+          <column type="field" width="-1" hidden="0" name="factor_14"/>
+          <column type="field" width="-1" hidden="0" name="factor_15"/>
+          <column type="field" width="-1" hidden="0" name="factor_16"/>
+          <column type="field" width="-1" hidden="0" name="factor_17"/>
+          <column type="field" width="-1" hidden="0" name="factor_18"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3144,33 +3215,54 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="factor_1"/>
-        <field editable="1" name="factor_10"/>
-        <field editable="1" name="factor_11"/>
-        <field editable="1" name="factor_12"/>
-        <field editable="1" name="factor_13"/>
-        <field editable="1" name="factor_14"/>
-        <field editable="1" name="factor_15"/>
-        <field editable="1" name="factor_16"/>
-        <field editable="1" name="factor_17"/>
-        <field editable="1" name="factor_18"/>
-        <field editable="1" name="factor_2"/>
-        <field editable="1" name="factor_3"/>
-        <field editable="1" name="factor_4"/>
-        <field editable="1" name="factor_5"/>
-        <field editable="1" name="factor_6"/>
-        <field editable="1" name="factor_7"/>
-        <field editable="1" name="factor_8"/>
-        <field editable="1" name="factor_9"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="pattern_id"/>
+        <field name="factor_1" editable="1"/>
+        <field name="factor_10" editable="1"/>
+        <field name="factor_11" editable="1"/>
+        <field name="factor_12" editable="1"/>
+        <field name="factor_13" editable="1"/>
+        <field name="factor_14" editable="1"/>
+        <field name="factor_15" editable="1"/>
+        <field name="factor_16" editable="1"/>
+        <field name="factor_17" editable="1"/>
+        <field name="factor_18" editable="1"/>
+        <field name="factor_2" editable="1"/>
+        <field name="factor_3" editable="1"/>
+        <field name="factor_4" editable="1"/>
+        <field name="factor_5" editable="1"/>
+        <field name="factor_6" editable="1"/>
+        <field name="factor_7" editable="1"/>
+        <field name="factor_8" editable="1"/>
+        <field name="factor_9" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="factor_1"/>
+        <field labelOnTop="0" name="factor_10"/>
+        <field labelOnTop="0" name="factor_11"/>
+        <field labelOnTop="0" name="factor_12"/>
+        <field labelOnTop="0" name="factor_13"/>
+        <field labelOnTop="0" name="factor_14"/>
+        <field labelOnTop="0" name="factor_15"/>
+        <field labelOnTop="0" name="factor_16"/>
+        <field labelOnTop="0" name="factor_17"/>
+        <field labelOnTop="0" name="factor_18"/>
+        <field labelOnTop="0" name="factor_2"/>
+        <field labelOnTop="0" name="factor_3"/>
+        <field labelOnTop="0" name="factor_4"/>
+        <field labelOnTop="0" name="factor_5"/>
+        <field labelOnTop="0" name="factor_6"/>
+        <field labelOnTop="0" name="factor_7"/>
+        <field labelOnTop="0" name="factor_8"/>
+        <field labelOnTop="0" name="factor_9"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pump_additional20171218122636750</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pump_additional" sql=</datasource>
       <keywordList>
@@ -3197,6 +3289,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -3213,7 +3314,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -3235,7 +3344,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3244,8 +3353,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3254,8 +3363,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3264,8 +3373,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3274,21 +3383,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="curve_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="PUMP_01" type="QString" value="PUMP_01"/>
-                  <Option name="PUMP_02" type="QString" value="PUMP_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3297,56 +3403,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CLOSED" type="QString" value="CLOSED"/>
-                  <Option name="OPEN" type="QString" value="OPEN"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="energyparam">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="EFFIC" type="QString" value="EFFIC"/>
-                  <Option name="PATTERN" type="QString" value="PATTERN"/>
-                  <Option name="PRICE" type="QString" value="PRICE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3355,8 +3443,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3377,54 +3465,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="order_id" applyOnUpdate="0" expression=""/>
-        <default field="power" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="speed" applyOnUpdate="0" expression=""/>
-        <default field="pattern" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="energyparam" applyOnUpdate="0" expression=""/>
-        <default field="energyvalue" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="order_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="energyparam" expression=""/>
+        <default applyOnUpdate="0" field="energyvalue" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="order_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="power" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="speed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="energyparam" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="energyvalue" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="order_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyparam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyvalue" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="order_id" desc="" exp=""/>
-        <constraint field="power" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="speed" desc="" exp=""/>
-        <constraint field="pattern" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="energyparam" desc="" exp=""/>
-        <constraint field="energyvalue" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="order_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="energyparam" desc=""/>
+        <constraint exp="" field="energyvalue" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="order_id" hidden="0" width="-1" type="field"/>
-          <column name="power" hidden="0" width="-1" type="field"/>
-          <column name="curve_id" hidden="0" width="-1" type="field"/>
-          <column name="speed" hidden="0" width="-1" type="field"/>
-          <column name="pattern" hidden="0" width="-1" type="field"/>
-          <column name="status" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="order_id"/>
+          <column type="field" width="-1" hidden="0" name="power"/>
+          <column type="field" width="-1" hidden="0" name="curve_id"/>
+          <column type="field" width="-1" hidden="0" name="speed"/>
+          <column type="field" width="-1" hidden="0" name="pattern"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="energyparam"/>
+          <column type="field" width="-1" hidden="0" name="energyvalue"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3456,23 +3548,34 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="curve_id"/>
-        <field editable="1" name="energyparam"/>
-        <field editable="1" name="energyvalue"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="order_id"/>
-        <field editable="1" name="pattern"/>
-        <field editable="1" name="power"/>
-        <field editable="1" name="speed"/>
-        <field editable="1" name="status"/>
+        <field name="curve_id" editable="1"/>
+        <field name="energyparam" editable="1"/>
+        <field name="energyvalue" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="order_id" editable="1"/>
+        <field name="pattern" editable="1"/>
+        <field name="power" editable="1"/>
+        <field name="speed" editable="1"/>
+        <field name="status" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="curve_id"/>
+        <field labelOnTop="0" name="energyparam"/>
+        <field labelOnTop="0" name="energyvalue"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="order_id"/>
+        <field labelOnTop="0" name="pattern"/>
+        <field labelOnTop="0" name="power"/>
+        <field labelOnTop="0" name="speed"/>
+        <field labelOnTop="0" name="status"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_quality20130813215615383</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_quality" sql=</datasource>
       <keywordList>
@@ -3537,7 +3640,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3553,8 +3656,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3567,30 +3670,30 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="initqual" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="initqual" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="initqual" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initqual" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="initqual" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="initqual" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" notificationMessage="" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="initqual" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="initqual"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3622,15 +3725,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="initqual"/>
-        <field editable="1" name="node_id"/>
+        <field name="initqual" editable="1"/>
+        <field name="node_id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_reactions_f73d50b8_9677_4153_a539_44288088218b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_reactions" sql=</datasource>
       <keywordList>
@@ -3691,7 +3794,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -3720,26 +3823,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3755,15 +3858,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="id"/>
+        <field name="descript" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_arc20180109103020214</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_arc" sql=</datasource>
       <keywordList>
@@ -3824,7 +3927,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3833,8 +3936,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3843,8 +3946,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3853,7 +3956,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="true"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -3875,31 +3978,31 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3915,17 +4018,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="text"/>
+        <field name="active" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_node20180109103020245</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_node" sql=</datasource>
       <keywordList>
@@ -3990,7 +4093,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3999,8 +4102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4009,8 +4112,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4019,7 +4122,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="true"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -4041,31 +4144,31 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="140" type="field"/>
-          <column name="text" hidden="0" width="257" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="140" hidden="0" name="node_id"/>
+          <column type="field" width="257" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4097,17 +4200,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="text"/>
+        <field name="active" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="-4.65661e-10" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="-4.65661e-10" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_source20130813215615594</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_source" sql=</datasource>
       <keywordList>
@@ -4134,6 +4237,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -4150,7 +4262,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -4168,10 +4288,11 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="variableNames" value="_fields_"/>
-        <property key="variableValues" value=""/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4180,22 +4301,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sourc_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CONCEN" type="QString" value="CONCEN"/>
-                  <Option name="FLOWPACED" type="QString" value="FLOWPACED"/>
-                  <Option name="MASS" type="QString" value="MASS"/>
-                  <Option name="SETPOINT" type="QString" value="SETPOINT"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4204,31 +4321,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4243,38 +4347,39 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="sourc_type" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="sourc_type" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="sourc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sourc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="sourc_type" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="sourc_type" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" notificationMessage="" id="{5bf224c0-cbdb-424f-bf89-7261c1778097}" type="1" capture="0">
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{e54b4ee0-6770-4558-9c37-87e9e290f252}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="sourc_type" hidden="0" width="-1" type="field"/>
-          <column name="quality" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="sourc_type"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4306,17 +4411,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="quality"/>
-        <field editable="1" name="sourc_type"/>
+        <field name="node_id" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="quality" editable="1"/>
+        <field name="sourc_type" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+        <field labelOnTop="0" name="quality"/>
+        <field labelOnTop="0" name="sourc_type"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -4375,7 +4485,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -4399,118 +4509,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule label="Obsolete" key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" symbol="0"/>
-          <rule label="On service" key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" symbol="1"/>
-          <rule label="Planified" key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" symbol="2"/>
-          <rule label="Varc" key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " symbol="3"/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4519,79 +4629,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="arccat_id">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placementFlags="10" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="0" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -4605,21 +4715,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4750,6 +4860,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -4820,6 +4937,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -4834,6 +4958,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="dqa_id">
           <editWidget type="Range">
             <config>
@@ -4841,6 +4972,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -5121,8 +5259,43 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="lastupdate_user">
-          <editWidget type="TextEdit">
+        <field name="lastupdate_user">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="depth">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
             <config>
               <Option/>
             </config>
@@ -5148,364 +5321,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="15"/>
         <alias field="macroexpl_id" name="" index="16"/>
         <alias field="sector_id" name="" index="17"/>
-        <alias field="macrosector_id" name="" index="18"/>
-        <alias field="state" name="" index="19"/>
-        <alias field="state_type" name="" index="20"/>
-        <alias field="annotation" name="" index="21"/>
-        <alias field="observ" name="" index="22"/>
-        <alias field="comment" name="" index="23"/>
-        <alias field="gis_length" name="" index="24"/>
-        <alias field="custom_length" name="" index="25"/>
-        <alias field="minsector_id" name="" index="26"/>
-        <alias field="dma_id" name="" index="27"/>
-        <alias field="macrodma_id" name="" index="28"/>
-        <alias field="presszone_id" name="" index="29"/>
-        <alias field="dqa_id" name="" index="30"/>
-        <alias field="macrodqa_id" name="" index="31"/>
-        <alias field="soilcat_id" name="" index="32"/>
-        <alias field="function_type" name="" index="33"/>
-        <alias field="category_type" name="" index="34"/>
-        <alias field="fluid_type" name="" index="35"/>
-        <alias field="location_type" name="" index="36"/>
-        <alias field="workcat_id" name="" index="37"/>
-        <alias field="workcat_id_end" name="" index="38"/>
-        <alias field="buildercat_id" name="" index="39"/>
-        <alias field="builtdate" name="" index="40"/>
-        <alias field="enddate" name="" index="41"/>
-        <alias field="ownercat_id" name="" index="42"/>
-        <alias field="muni_id" name="" index="43"/>
-        <alias field="postcode" name="" index="44"/>
-        <alias field="district_id" name="" index="45"/>
-        <alias field="streetname" name="" index="46"/>
-        <alias field="postnumber" name="" index="47"/>
-        <alias field="postcomplement" name="" index="48"/>
-        <alias field="streetname2" name="" index="49"/>
-        <alias field="postnumber2" name="" index="50"/>
-        <alias field="postcomplement2" name="" index="51"/>
-        <alias field="descript" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="cat_arctype_id" name="" index="63"/>
-        <alias field="nodetype_1" name="" index="64"/>
-        <alias field="staticpress1" name="" index="65"/>
-        <alias field="nodetype_2" name="" index="66"/>
-        <alias field="staticpress2" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation1" applyOnUpdate="0" expression=""/>
-        <default field="depth1" applyOnUpdate="0" expression=""/>
-        <default field="elevation2" applyOnUpdate="0" expression=""/>
-        <default field="depth2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="cat_arctype_id" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_1" applyOnUpdate="0" expression=""/>
-        <default field="staticpress1" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_2" applyOnUpdate="0" expression=""/>
-        <default field="staticpress2" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_arctype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation1" desc="" exp=""/>
-        <constraint field="depth1" desc="" exp=""/>
-        <constraint field="elevation2" desc="" exp=""/>
-        <constraint field="depth2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="cat_arctype_id" desc="" exp=""/>
-        <constraint field="nodetype_1" desc="" exp=""/>
-        <constraint field="staticpress1" desc="" exp=""/>
-        <constraint field="nodetype_2" desc="" exp=""/>
-        <constraint field="staticpress2" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="node_1" hidden="0" width="-1" type="field"/>
-          <column name="node_2" hidden="0" width="-1" type="field"/>
-          <column name="elevation1" hidden="0" width="-1" type="field"/>
-          <column name="depth1" hidden="0" width="-1" type="field"/>
-          <column name="elevation2" hidden="0" width="-1" type="field"/>
-          <column name="depth2" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="custom_length" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="cat_arctype_id" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_1" hidden="0" width="-1" type="field"/>
-          <column name="staticpress1" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_2" hidden="0" width="-1" type="field"/>
-          <column name="staticpress2" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5537,79 +5746,79 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="arc_type"/>
-        <field editable="1" name="arccat_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_arctype_id"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="custom_length"/>
-        <field editable="1" name="depth1"/>
-        <field editable="1" name="depth2"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation1"/>
-        <field editable="1" name="elevation2"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_1"/>
-        <field editable="1" name="node_2"/>
-        <field editable="1" name="nodetype_1"/>
-        <field editable="1" name="nodetype_2"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpress1"/>
-        <field editable="1" name="staticpress2"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="arc_type" editable="1"/>
+        <field name="arccat_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_arctype_id" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="custom_length" editable="1"/>
+        <field name="depth1" editable="1"/>
+        <field name="depth2" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation1" editable="1"/>
+        <field name="elevation2" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_1" editable="1"/>
+        <field name="node_2" editable="1"/>
+        <field name="nodetype_1" editable="1"/>
+        <field name="nodetype_2" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpress1" editable="1"/>
+        <field name="staticpress2" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -5690,7 +5899,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxcircle20180403155702431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxcircle" (geom_polygon) sql=</datasource>
       <keywordList>
@@ -5750,26 +5959,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="115,189,167,0"/>
-              <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="227,26,28,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="115,189,167,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="227,26,28,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5787,21 +5996,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5810,8 +6019,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5823,20 +6032,20 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5868,14 +6077,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
+        <field name="id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxpoint20180403155702690</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxpoint" (geom_point) sql=</datasource>
       <keywordList>
@@ -5935,33 +6144,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5979,21 +6188,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6002,8 +6211,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6015,20 +6224,20 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6060,14 +6269,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
+        <field name="id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -6126,7 +6335,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -6150,179 +6359,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule label="Greentap" scalemindenom="1" key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; = 'GREENTAP'" symbol="0"/>
-          <rule label="Wjoin" scalemindenom="1" key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='WJOIN'" symbol="1"/>
-          <rule label="Tap" scalemindenom="1" key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='TAP'" symbol="2"/>
-          <rule label="Fountain" scalemindenom="1" key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='FOUNTAIN'" symbol="3"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6338,21 +6547,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6427,6 +6636,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -6532,6 +6748,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -6546,6 +6769,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -6560,6 +6790,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -6861,6 +7098,27 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="connec_id" name="" index="0"/>
@@ -6873,372 +7131,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="7"/>
         <alias field="macroexpl_id" name="" index="8"/>
         <alias field="sector_id" name="" index="9"/>
-        <alias field="macrosector_id" name="" index="10"/>
-        <alias field="customer_code" name="" index="11"/>
-        <alias field="cat_matcat_id" name="" index="12"/>
-        <alias field="cat_pnom" name="" index="13"/>
-        <alias field="cat_dnom" name="" index="14"/>
-        <alias field="connec_length" name="" index="15"/>
-        <alias field="state" name="" index="16"/>
-        <alias field="state_type" name="" index="17"/>
-        <alias field="n_hydrometer" name="" index="18"/>
-        <alias field="arc_id" name="" index="19"/>
-        <alias field="annotation" name="" index="20"/>
-        <alias field="observ" name="" index="21"/>
-        <alias field="comment" name="" index="22"/>
-        <alias field="minsector_id" name="" index="23"/>
-        <alias field="dma_id" name="" index="24"/>
-        <alias field="macrodma_id" name="" index="25"/>
-        <alias field="presszone_id" name="" index="26"/>
-        <alias field="staticpressure" name="" index="27"/>
-        <alias field="dqa_id" name="" index="28"/>
-        <alias field="macrodqa_id" name="" index="29"/>
-        <alias field="soilcat_id" name="" index="30"/>
-        <alias field="function_type" name="" index="31"/>
-        <alias field="category_type" name="" index="32"/>
-        <alias field="fluid_type" name="" index="33"/>
-        <alias field="location_type" name="" index="34"/>
-        <alias field="workcat_id" name="" index="35"/>
-        <alias field="workcat_id_end" name="" index="36"/>
-        <alias field="buildercat_id" name="" index="37"/>
-        <alias field="builtdate" name="" index="38"/>
-        <alias field="enddate" name="" index="39"/>
-        <alias field="ownercat_id" name="" index="40"/>
-        <alias field="muni_id" name="" index="41"/>
-        <alias field="postcode" name="" index="42"/>
-        <alias field="district_id" name="" index="43"/>
-        <alias field="streetname" name="" index="44"/>
-        <alias field="postnumber" name="" index="45"/>
-        <alias field="postcomplement" name="" index="46"/>
-        <alias field="streetname2" name="" index="47"/>
-        <alias field="postnumber2" name="" index="48"/>
-        <alias field="postcomplement2" name="" index="49"/>
-        <alias field="descript" name="" index="50"/>
-        <alias field="svg" name="" index="51"/>
-        <alias field="rotation" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="connectype_id" name="" index="63"/>
-        <alias field="feature_id" name="" index="64"/>
-        <alias field="featurecat_id" name="" index="65"/>
-        <alias field="pjoint_id" name="" index="66"/>
-        <alias field="pjoint_type" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connec_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="connec_length" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="n_hydrometer" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="connectype_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="n_hydrometer" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connectype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connec_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="connec_length" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="n_hydrometer" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="connectype_id" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="connec_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="connecat_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="connec_length" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="n_hydrometer" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="connectype_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_type" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7270,78 +7556,78 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="connec_length"/>
-        <field editable="1" name="connec_type"/>
-        <field editable="1" name="connecat_id"/>
-        <field editable="1" name="connectype_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="n_hydrometer"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="pjoint_id"/>
-        <field editable="1" name="pjoint_type"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="connec_id" editable="1"/>
+        <field name="connec_length" editable="1"/>
+        <field name="connec_type" editable="1"/>
+        <field name="connecat_id" editable="1"/>
+        <field name="connectype_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="n_hydrometer" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pjoint_id" editable="1"/>
+        <field name="pjoint_type" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -7421,7 +7707,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -7474,7 +7760,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7498,586 +7784,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-          <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-          <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot; +180"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-                <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@4" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -8087,611 +8373,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule scalemindenom="1" key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{750be282-d4cc-4137-9551-e68430260327}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -8847,27 +9133,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8876,8 +9162,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -8886,8 +9172,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -8896,8 +9182,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -8906,16 +9192,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -8923,8 +9212,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -8933,8 +9222,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -8943,23 +9232,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -8967,8 +9262,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -8977,34 +9272,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9013,16 +9302,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -9048,81 +9340,82 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="x_label" applyOnUpdate="0" expression=""/>
-        <default field="y_label" applyOnUpdate="0" expression=""/>
-        <default field="rotation_label" applyOnUpdate="0" expression=""/>
-        <default field="offset_label" applyOnUpdate="0" expression=""/>
-        <default field="direction_arrow" applyOnUpdate="0" expression=""/>
-        <default field="x_symbol" applyOnUpdate="0" expression=""/>
-        <default field="y_symbol" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="offset_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="direction_arrow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="x_label" desc="" exp=""/>
-        <constraint field="y_label" desc="" exp=""/>
-        <constraint field="rotation_label" desc="" exp=""/>
-        <constraint field="offset_label" desc="" exp=""/>
-        <constraint field="direction_arrow" desc="" exp=""/>
-        <constraint field="x_symbol" desc="" exp=""/>
-        <constraint field="y_symbol" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="x_label" hidden="0" width="-1" type="field"/>
-          <column name="y_label" hidden="0" width="-1" type="field"/>
-          <column name="rotation_label" hidden="0" width="-1" type="field"/>
-          <column name="offset_label" hidden="0" width="-1" type="field"/>
-          <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-          <column name="x_symbol" hidden="0" width="-1" type="field"/>
-          <column name="y_symbol" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9154,24 +9447,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="direction_arrow"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="offset_label"/>
-        <field editable="1" name="rotation_label"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="x_label"/>
-        <field editable="1" name="x_symbol"/>
-        <field editable="1" name="y_label"/>
-        <field editable="1" name="y_symbol"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="direction_arrow" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="offset_label" editable="1"/>
+        <field name="rotation_label" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="x_label" editable="1"/>
+        <field name="x_symbol" editable="1"/>
+        <field name="y_label" editable="1"/>
+        <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -9192,7 +9486,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -9251,7 +9545,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -9275,145 +9569,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dma1-1d" value="dma1-1d" symbol="0"/>
-          <category render="true" label="dma1-2d" value="dma1-2d" symbol="1"/>
-          <category render="true" label="dma2-1d" value="dma2-1d" symbol="2"/>
-          <category render="true" label="source-1" value="source-1" symbol="3"/>
-          <category render="true" label="source-2" value="source-2" symbol="4"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9431,27 +9725,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="dma_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9460,8 +9754,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9470,8 +9764,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9480,8 +9774,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9490,8 +9784,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9500,8 +9794,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9510,8 +9804,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9520,8 +9814,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9530,8 +9824,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9540,8 +9834,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9550,8 +9844,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9560,8 +9854,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9570,8 +9864,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9602,74 +9896,74 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="minc" applyOnUpdate="0" expression=""/>
-        <default field="maxc" applyOnUpdate="0" expression=""/>
-        <default field="effc" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dma_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="effc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="minc" desc="" exp=""/>
-        <constraint field="maxc" desc="" exp=""/>
-        <constraint field="effc" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" notificationMessage="" id="{be5d940b-02fd-451d-a305-acaddf30c925}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="176" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="minc" hidden="0" width="-1" type="field"/>
-          <column name="maxc" hidden="0" width="-1" type="field"/>
-          <column name="effc" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9701,18 +9995,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="effc"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="maxc"/>
-        <field editable="1" name="minc"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="effc" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="maxc" editable="1"/>
+        <field name="minc" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -9732,7 +10026,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -9791,7 +10085,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -9815,122 +10109,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dqa1-1d" value="dqa1-1d" symbol="0"/>
-          <category render="true" label="dqa1-1s" value="dqa1-1s" symbol="1"/>
-          <category render="true" label="dqa2-1d" value="dqa2-1d" symbol="2"/>
-          <category render="true" label="dqa2-1s" value="dqa2-1s" symbol="3"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9953,21 +10247,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9976,8 +10270,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9986,8 +10280,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9996,8 +10290,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10006,8 +10300,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10016,8 +10310,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10026,8 +10320,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10036,8 +10330,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10046,8 +10340,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10056,8 +10350,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10066,8 +10360,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10096,61 +10390,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_type" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dqa_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="dqa_type" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_type" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10182,17 +10476,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="dqa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="nodeparent"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="dqa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="nodeparent" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -10211,13 +10505,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -10270,7 +10558,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -10294,33 +10582,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10338,21 +10626,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10360,21 +10648,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10382,8 +10679,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10392,41 +10689,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CANCELED FICTICIOUS" type="QString" value="95"/>
-                  <Option name="CANCELED PLANIFIED" type="QString" value="96"/>
-                  <Option name="DONE FICTICIOUS" type="QString" value="97"/>
-                  <Option name="DONE PLANIFIED" type="QString" value="98"/>
-                  <Option name="FICTICIUS" type="QString" value="99"/>
-                  <Option name="OBSOLETE" type="QString" value="1"/>
-                  <Option name="ON_SERVICE" type="QString" value="2"/>
-                  <Option name="PLANIFIED" type="QString" value="3"/>
-                  <Option name="PROVISIONAL" type="QString" value="5"/>
-                  <Option name="RECONSTRUCT" type="QString" value="4"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10435,8 +10719,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10445,8 +10729,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10455,8 +10739,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10464,42 +10748,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Category" type="QString" value="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Location" type="QString" value="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Fluid" type="QString" value="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10507,27 +10788,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="builder1" type="QString" value="builder1"/>
-                  <Option name="builder2" type="QString" value="builder2"/>
-                  <Option name="builder3" type="QString" value="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10536,8 +10819,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10546,22 +10829,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="owner1" type="QString" value="owner1"/>
-                  <Option name="owner2" type="QString" value="owner2"/>
-                  <Option name="owner3" type="QString" value="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10570,8 +10849,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10580,21 +10859,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10603,8 +10879,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10613,8 +10889,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10623,8 +10899,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10633,16 +10909,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10650,21 +10929,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10701,142 +10987,147 @@ def my_form_open(dialog, layer, feature):
         <alias field="inventory" name="inventory" index="27"/>
         <alias field="undelete" name="undelete" index="28"/>
         <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="element_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elementcat_id" applyOnUpdate="0" expression=""/>
-        <default field="elementtype_id" applyOnUpdate="0" expression=""/>
-        <default field="serial_number" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="num_elements" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="element_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementtype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="serial_number" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_elements" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="element_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elementcat_id" desc="" exp=""/>
-        <constraint field="elementtype_id" desc="" exp=""/>
-        <constraint field="serial_number" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="num_elements" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="element_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elementcat_id" hidden="0" width="-1" type="field"/>
-          <column name="serial_number" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="num_elements" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="elementtype_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10868,36 +11159,37 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="element_id"/>
-        <field editable="1" name="elementcat_id"/>
-        <field editable="1" name="elementtype_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="num_elements"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="serial_number"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="element_id" editable="1"/>
+        <field name="elementcat_id" editable="1"/>
+        <field name="elementtype_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="num_elements" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="serial_number" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="buildercat_id"/>
@@ -10921,6 +11213,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -10942,7 +11235,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11001,7 +11294,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -11025,26 +11318,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11062,37 +11355,43 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="expl_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11101,20 +11400,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Macroexploitation-1" type="QString" value="1"/>
-                  <Option name="Undefined" type="QString" value="0"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11123,23 +11420,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11155,42 +11461,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="expl_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="168" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11222,12 +11528,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -11241,7 +11547,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11249,7 +11555,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_connec" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_connec" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -11307,33 +11613,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="164,113,88,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11346,7 +11652,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -11479,61 +11785,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -11554,7 +11860,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_edit_inp_demand20180212154336936</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_demand" sql=</datasource>
       <keywordList>
@@ -11581,6 +11887,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -11597,7 +11912,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -11619,7 +11942,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11628,18 +11951,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="node_id">
+        <field name="feature_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11648,54 +11971,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="deman_type">
-          <editWidget type="ValueMap">
+        <field name="demand_type">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CRM PERIOD" type="QString" value="2"/>
-                  <Option name="ESTIMATED" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dscenario_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Hydrants_50%" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="feature_type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11703,51 +12020,56 @@ def my_form_open(dialog, layer, feature):
       </fieldConfiguration>
       <aliases>
         <alias field="id" name="id" index="0"/>
-        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="feature_id" name="" index="1"/>
         <alias field="demand" name="demand" index="2"/>
         <alias field="pattern_id" name="pattern_id" index="3"/>
-        <alias field="deman_type" name="deman_type" index="4"/>
+        <alias field="demand_type" name="" index="4"/>
         <alias field="dscenario_id" name="dscenario_id" index="5"/>
+        <alias field="feature_type" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="deman_type" applyOnUpdate="0" expression=""/>
-        <default field="dscenario_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="demand_type" expression=""/>
+        <default applyOnUpdate="0" field="dscenario_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="deman_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dscenario_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dscenario_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="deman_type" desc="" exp=""/>
-        <constraint field="dscenario_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="demand_type" desc=""/>
+        <constraint exp="" field="dscenario_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="demand" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="deman_type" hidden="0" width="-1" type="field"/>
-          <column name="dscenario_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dscenario_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="demand_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11779,19 +12101,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="deman_type"/>
-        <field editable="1" name="demand"/>
-        <field editable="1" name="dscenario_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pattern_id"/>
+        <field name="deman_type" editable="1"/>
+        <field name="demand" editable="1"/>
+        <field name="demand_type" editable="1"/>
+        <field name="dscenario_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="demand"/>
+        <field labelOnTop="0" name="demand_type"/>
+        <field labelOnTop="0" name="dscenario_id"/>
+        <field labelOnTop="0" name="feature_id"/>
+        <field labelOnTop="0" name="feature_type"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11799,7 +12132,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_inlet" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_inlet" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -11857,33 +12190,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="135,221,121,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="135,221,121,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11896,7 +12229,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -12053,70 +12386,70 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="initlevel" applyOnUpdate="0" expression=""/>
-        <default field="minlevel" applyOnUpdate="0" expression=""/>
-        <default field="maxlevel" applyOnUpdate="0" expression=""/>
-        <default field="diameter" applyOnUpdate="0" expression=""/>
-        <default field="minvol" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="initlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="diameter" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minvol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="initlevel" desc="" exp=""/>
-        <constraint field="minlevel" desc="" exp=""/>
-        <constraint field="maxlevel" desc="" exp=""/>
-        <constraint field="diameter" desc="" exp=""/>
-        <constraint field="minvol" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -12137,7 +12470,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12145,7 +12478,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_junction" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_junction" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -12203,33 +12536,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12242,7 +12575,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -12351,52 +12684,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -12417,7 +12750,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12425,7 +12758,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pipe" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pipe" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -12483,37 +12816,37 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="30,128,239,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="30,128,239,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineWidth" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineWidth">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12526,7 +12859,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -12667,64 +13000,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="custom_roughness" applyOnUpdate="0" expression=""/>
-        <default field="custom_dint" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="custom_roughness" expression=""/>
+        <default applyOnUpdate="0" field="custom_dint" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_roughness" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_dint" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_roughness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_dint" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="custom_roughness" desc="" exp=""/>
-        <constraint field="custom_dint" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="custom_roughness" desc=""/>
+        <constraint exp="" field="custom_dint" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -12745,7 +13078,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12753,7 +13086,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pump" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pump" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -12811,33 +13144,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="92,146,179,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="92,146,179,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12850,7 +13183,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13007,70 +13340,70 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="power" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="speed" applyOnUpdate="0" expression=""/>
-        <default field="pattern" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="pump_type" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="pump_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="power" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="speed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pump_type" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pump_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="power" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="speed" desc="" exp=""/>
-        <constraint field="pattern" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="pump_type" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="pump_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13091,7 +13424,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13099,7 +13432,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_reservoir" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_reservoir" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13157,33 +13490,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,203,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,203,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13196,7 +13529,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13305,52 +13638,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13371,7 +13704,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13379,7 +13712,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_shortpipe" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_shortpipe" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13437,33 +13770,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13476,7 +13809,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13601,58 +13934,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13673,9 +14006,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13733,33 +14066,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13772,7 +14105,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13921,67 +14254,67 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="initlevel" applyOnUpdate="0" expression=""/>
-        <default field="minlevel" applyOnUpdate="0" expression=""/>
-        <default field="maxlevel" applyOnUpdate="0" expression=""/>
-        <default field="diameter" applyOnUpdate="0" expression=""/>
-        <default field="minvol" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="initlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="diameter" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minvol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="initlevel" desc="" exp=""/>
-        <constraint field="minlevel" desc="" exp=""/>
-        <constraint field="maxlevel" desc="" exp=""/>
-        <constraint field="diameter" desc="" exp=""/>
-        <constraint field="minvol" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -14002,7 +14335,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -14010,7 +14343,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_valve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_valve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14068,33 +14401,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="130,85,101,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="130,85,101,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14107,7 +14440,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -14264,70 +14597,70 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="valv_type" applyOnUpdate="0" expression=""/>
-        <default field="pressure" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="coef_loss" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="valv_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="coef_loss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="valv_type" desc="" exp=""/>
-        <constraint field="pressure" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="coef_loss" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -14348,9 +14681,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14408,31 +14741,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="111,182,175,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="111,182,175,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14445,7 +14778,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -14626,79 +14959,79 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="valv_type" applyOnUpdate="0" expression=""/>
-        <default field="pressure" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="coef_loss" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="valv_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="coef_loss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="valv_type" desc="" exp=""/>
-        <constraint field="pressure" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="coef_loss" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -14719,7 +15052,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -14779,7 +15112,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -14803,69 +15136,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -14885,27 +15218,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="link_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14914,24 +15247,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -14940,24 +15267,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -14966,92 +15287,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrosector_01" type="QString" value="1"/>
-                  <Option name="macrosector_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15060,8 +15357,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15070,8 +15367,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15079,28 +15376,40 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -15127,86 +15436,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="link_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="exit_type" applyOnUpdate="0" expression=""/>
-        <default field="exit_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="userdefined_geom" applyOnUpdate="0" expression=""/>
-        <default field="ispsectorgeom" applyOnUpdate="0" expression=""/>
-        <default field="psector_rowid" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="vnode_topelev" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="link_id" notnull_strength="2" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="userdefined_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ispsectorgeom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_rowid" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vnode_topelev" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="link_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="exit_type" desc="" exp=""/>
-        <constraint field="exit_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="userdefined_geom" desc="" exp=""/>
-        <constraint field="ispsectorgeom" desc="" exp=""/>
-        <constraint field="psector_rowid" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="vnode_topelev" desc="" exp=""/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;sector_id&quot;">
+      <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="link_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="exit_type" hidden="0" width="-1" type="field"/>
-          <column name="exit_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="userdefined_geom" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="ispsectorgeom" hidden="0" width="-1" type="field"/>
-          <column name="psector_rowid" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="vnode_topelev" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15238,23 +15547,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="exit_id"/>
-        <field editable="1" name="exit_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="ispsectorgeom"/>
-        <field editable="1" name="link_id"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="psector_rowid"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="userdefined_geom"/>
-        <field editable="1" name="vnode_topelev"/>
+        <field name="dma_id" editable="1"/>
+        <field name="exit_id" editable="1"/>
+        <field name="exit_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="ispsectorgeom" editable="1"/>
+        <field name="link_id" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="psector_rowid" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="userdefined_geom" editable="1"/>
+        <field name="vnode_topelev" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -15279,7 +15588,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15338,7 +15647,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15362,989 +15671,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule label="Wtp" key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WTP'" symbol="0"/>
-          <rule label="Waterwell" key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WATERWELL'" symbol="1"/>
-          <rule label="Source" key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'SOURCE'" symbol="2"/>
-          <rule label="Tank" key="{5d885b4a-fd95-42b2-8da9-717face5a272}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'TANK'" symbol="3"/>
-          <rule label="Expantank" key="{eed06555-2d38-4bfe-b114-13e014b63af1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" symbol="4"/>
-          <rule label="Filter" key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FILTER'" symbol="5"/>
-          <rule label="Flexunion" key="{9f0ffeda-84af-4676-9263-119eb6042786}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FLEXUNION'" symbol="6"/>
-          <rule label="Hydrant" key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'HYDRANT'" symbol="7"/>
-          <rule label="Meter" key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'METER'" symbol="8"/>
-          <rule label="Netelement" key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETELEMENT'" symbol="9"/>
-          <rule label="Netsamplepoint" key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" symbol="10"/>
-          <rule label="Pump" key="{01479095-8f9e-40cf-b92b-6e13874561ae}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'PUMP'" symbol="11"/>
-          <rule label="Register" key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REGISTER'" symbol="12"/>
-          <rule label="Manhole" key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'MANHOLE'" symbol="13"/>
-          <rule label="Reduction" key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REDUCTION'" symbol="14"/>
-          <rule label="Valve" key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'VALVE'" symbol="15"/>
-          <rule label="Junction" key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'JUNCTION'" symbol="16"/>
-          <rule label="Netwjoin" key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" scalemaxdenom="1500" filter="&quot;sys_type&quot; = 'NETWJOIN'" symbol="17"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="10" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="11" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="12" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="13" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="14" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="15" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="16" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="17" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="7" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="8" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="9" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16361,21 +16670,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16478,6 +16787,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -16541,8 +16857,15 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="dma_id">
-          <editWidget type="Range">
+        <field name="dma_id">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_name">
+          <editWidget type="">
             <config>
               <Option/>
             </config>
@@ -16562,6 +16885,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -16576,6 +16906,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -16856,6 +17193,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="node_id" name="" index="0"/>
@@ -16872,348 +17244,384 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="11"/>
         <alias field="macroexpl_id" name="" index="12"/>
         <alias field="sector_id" name="" index="13"/>
-        <alias field="macrosector_id" name="" index="14"/>
-        <alias field="arc_id" name="" index="15"/>
-        <alias field="parent_id" name="" index="16"/>
-        <alias field="state" name="" index="17"/>
-        <alias field="state_type" name="" index="18"/>
-        <alias field="annotation" name="" index="19"/>
-        <alias field="observ" name="" index="20"/>
-        <alias field="comment" name="" index="21"/>
-        <alias field="minsector_id" name="" index="22"/>
-        <alias field="dma_id" name="" index="23"/>
-        <alias field="macrodma_id" name="" index="24"/>
-        <alias field="presszone_id" name="" index="25"/>
-        <alias field="staticpressure" name="" index="26"/>
-        <alias field="dqa_id" name="" index="27"/>
-        <alias field="macrodqa_id" name="" index="28"/>
-        <alias field="soilcat_id" name="" index="29"/>
-        <alias field="function_type" name="" index="30"/>
-        <alias field="category_type" name="" index="31"/>
-        <alias field="fluid_type" name="" index="32"/>
-        <alias field="location_type" name="" index="33"/>
-        <alias field="workcat_id" name="" index="34"/>
-        <alias field="workcat_id_end" name="" index="35"/>
-        <alias field="builtdate" name="" index="36"/>
-        <alias field="enddate" name="" index="37"/>
-        <alias field="buildercat_id" name="" index="38"/>
-        <alias field="ownercat_id" name="" index="39"/>
-        <alias field="muni_id" name="" index="40"/>
-        <alias field="postcode" name="" index="41"/>
-        <alias field="district_id" name="" index="42"/>
-        <alias field="streetname" name="" index="43"/>
-        <alias field="postnumber" name="" index="44"/>
-        <alias field="postcomplement" name="" index="45"/>
-        <alias field="streetname2" name="" index="46"/>
-        <alias field="postnumber2" name="" index="47"/>
-        <alias field="postcomplement2" name="" index="48"/>
-        <alias field="descript" name="" index="49"/>
-        <alias field="svg" name="" index="50"/>
-        <alias field="rotation" name="" index="51"/>
-        <alias field="link" name="" index="52"/>
-        <alias field="verified" name="" index="53"/>
-        <alias field="undelete" name="" index="54"/>
-        <alias field="label" name="" index="55"/>
-        <alias field="label_x" name="" index="56"/>
-        <alias field="label_y" name="" index="57"/>
-        <alias field="label_rotation" name="" index="58"/>
-        <alias field="publish" name="" index="59"/>
-        <alias field="inventory" name="" index="60"/>
-        <alias field="hemisphere" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="nodetype_id" name="" index="63"/>
-        <alias field="tstamp" name="" index="64"/>
-        <alias field="insert_user" name="" index="65"/>
-        <alias field="lastupdate" name="" index="66"/>
-        <alias field="lastupdate_user" name="" index="67"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="parent_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="hemisphere" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_id" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="parent_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hemisphere" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="parent_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="hemisphere" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="nodetype_id" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="node_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="nodecat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="parent_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="hemisphere" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_id" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17245,74 +17653,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="hemisphere"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="node_type"/>
-        <field editable="1" name="nodecat_id"/>
-        <field editable="1" name="nodetype_id"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="parent_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="hemisphere" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="node_type" editable="1"/>
+        <field name="nodecat_id" editable="1"/>
+        <field name="nodetype_id" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="parent_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -17388,7 +17796,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -17421,6 +17829,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -17437,7 +17854,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -17454,33 +17879,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="22,186,107,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="22,186,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17489,11 +17914,29 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17502,19 +17945,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="visitcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Test" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17523,8 +17965,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17533,8 +17975,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17543,8 +17985,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17553,8 +17995,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17563,21 +18005,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -17596,48 +18035,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="visitcat_id" applyOnUpdate="0" expression=""/>
-        <default field="ext_code" applyOnUpdate="0" expression=""/>
-        <default field="startdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="user_name" applyOnUpdate="0" expression=""/>
-        <default field="webclient_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="visitcat_id" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="startdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="user_name" expression=""/>
+        <default applyOnUpdate="0" field="webclient_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="visitcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ext_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="startdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="user_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="webclient_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="visitcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="startdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="user_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="webclient_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="visitcat_id" desc="" exp=""/>
-        <constraint field="ext_code" desc="" exp=""/>
-        <constraint field="startdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="user_name" desc="" exp=""/>
-        <constraint field="webclient_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="visitcat_id" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="startdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="user_name" desc=""/>
+        <constraint exp="" field="webclient_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="startdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="user_name" hidden="0" width="-1" type="field"/>
-          <column name="webclient_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="startdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="user_name"/>
+          <column type="field" width="-1" hidden="0" name="webclient_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="visitcat_id"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17649,25 +18090,50 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="ext_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="startdate"/>
-        <field editable="1" name="user_name"/>
-        <field editable="1" name="visitcat_id"/>
-        <field editable="1" name="webclient_id"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="ext_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="startdate" editable="1"/>
+        <field name="user_name" editable="1"/>
+        <field name="visitcat_id" editable="1"/>
+        <field name="webclient_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="enddate"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="startdate"/>
+        <field labelOnTop="0" name="user_name"/>
+        <field labelOnTop="0" name="visitcat_id"/>
+        <field labelOnTop="0" name="webclient_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "user_name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -17675,7 +18141,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -17726,7 +18192,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -17750,168 +18216,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="pzone1-1d" value="pzone1-1d" symbol="0"/>
-          <category render="true" label="pzone1-1s" value="pzone1-1s" symbol="1"/>
-          <category render="true" label="pzone1-2d" value="pzone1-2d" symbol="2"/>
-          <category render="true" label="pzone1-2s" value="pzone1-2s" symbol="3"/>
-          <category render="true" label="pzone2-1s" value="pzone2-1s" symbol="4"/>
-          <category render="true" label="pzone2-2d" value="pzone2-2d" symbol="5"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17929,27 +18395,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -18008,42 +18474,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="presszone_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="stylesheet" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18075,12 +18541,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="head"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="stylesheet"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="head" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="stylesheet" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -18094,7 +18560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="5000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -18147,7 +18613,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -18171,59 +18637,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18240,28 +18706,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer upperValue="0" classificationAttributeExpression="" attributeLegend="1" lowerValue="0" upperHeight="50" diagramType="Histogram" lowerWidth="0" upperWidth="50" lowerHeight="0">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="sample_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18270,8 +18736,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18280,8 +18746,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18290,8 +18756,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18300,122 +18766,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ADAPTATION" type="QString" value="ADAPTATION"/>
-                  <Option name="AIR_VALVE" type="QString" value="AIR_VALVE"/>
-                  <Option name="BYPASS_REGISTER" type="QString" value="BYPASS_REGISTER"/>
-                  <Option name="CHECK_VALVE" type="QString" value="CHECK_VALVE"/>
-                  <Option name="CLORINATHOR" type="QString" value="CLORINATHOR"/>
-                  <Option name="CONTROL_REGISTER" type="QString" value="CONTROL_REGISTER"/>
-                  <Option name="CURVE" type="QString" value="CURVE"/>
-                  <Option name="ENDLINE" type="QString" value="ENDLINE"/>
-                  <Option name="EXPANTANK" type="QString" value="EXPANTANK"/>
-                  <Option name="FILTER" type="QString" value="FILTER"/>
-                  <Option name="FLEXUNION" type="QString" value="FLEXUNION"/>
-                  <Option name="FLOWMETER" type="QString" value="FLOWMETER"/>
-                  <Option name="FL_CONTR_VALVE" type="QString" value="FL_CONTR_VALVE"/>
-                  <Option name="FOUNTAIN" type="QString" value="FOUNTAIN"/>
-                  <Option name="GEN_PURP_VALVE" type="QString" value="GEN_PURP_VALVE"/>
-                  <Option name="GREENTAP" type="QString" value="GREENTAP"/>
-                  <Option name="GREEN_VALVE" type="QString" value="GREEN_VALVE"/>
-                  <Option name="HYDRANT" type="QString" value="HYDRANT"/>
-                  <Option name="JUNCTION" type="QString" value="JUNCTION"/>
-                  <Option name="MANHOLE" type="QString" value="MANHOLE"/>
-                  <Option name="NETELEMENT" type="QString" value="NETELEMENT"/>
-                  <Option name="NETSAMPLEPOINT" type="QString" value="NETSAMPLEPOINT"/>
-                  <Option name="OUTFALL_VALVE" type="QString" value="OUTFALL_VALVE"/>
-                  <Option name="PIPE" type="QString" value="PIPE"/>
-                  <Option name="PRESSURE_METER" type="QString" value="PRESSURE_METER"/>
-                  <Option name="PR_BREAK_VALVE" type="QString" value="PR_BREAK_VALVE"/>
-                  <Option name="PR_REDUC_VALVE" type="QString" value="PR_REDUC_VALVE"/>
-                  <Option name="PR_SUSTA_VALVE" type="QString" value="PR_SUSTA_VALVE"/>
-                  <Option name="PUMP" type="QString" value="PUMP"/>
-                  <Option name="REDUCTION" type="QString" value="REDUCTION"/>
-                  <Option name="REGISTER" type="QString" value="REGISTER"/>
-                  <Option name="SHUTOFF_VALVE" type="QString" value="SHUTOFF_VALVE"/>
-                  <Option name="SOURCE" type="QString" value="SOURCE"/>
-                  <Option name="T" type="QString" value="T"/>
-                  <Option name="TANK" type="QString" value="TANK"/>
-                  <Option name="TAP" type="QString" value="TAP"/>
-                  <Option name="THROTTLE_VALVE" type="QString" value="THROTTLE_VALVE"/>
-                  <Option name="VALVE_REGISTER" type="QString" value="VALVE_REGISTER"/>
-                  <Option name="VARC" type="QString" value="VARC"/>
-                  <Option name="VCONNEC" type="QString" value="VCONNEC"/>
-                  <Option name="WATERWELL" type="QString" value="WATERWELL"/>
-                  <Option name="WATER_CONNECTION" type="QString" value="WATER_CONNECTION"/>
-                  <Option name="WJOIN" type="QString" value="WJOIN"/>
-                  <Option name="WTP" type="QString" value="WTP"/>
-                  <Option name="X" type="QString" value="X"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="presszonecat_id">
-          <editWidget type="ValueMap">
+        <field name="presszone_id">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="pzone1-1d" type="QString" value="3"/>
-                  <Option name="pzone1-1s" type="QString" value="1"/>
-                  <Option name="pzone1-2d" type="QString" value="4"/>
-                  <Option name="pzone1-2s" type="QString" value="2"/>
-                  <Option name="pzone2-1s" type="QString" value="5"/>
-                  <Option name="pzone2-2d" type="QString" value="6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18424,10 +18826,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18436,32 +18839,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="work1" type="QString" value="work1"/>
-                  <Option name="work2" type="QString" value="work2"/>
-                  <Option name="work3" type="QString" value="work3"/>
-                  <Option name="work4" type="QString" value="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -18469,54 +18872,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18525,14 +18902,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option name="AllowMulti" type="QString" value="0"/>
-                <Option name="AllowNull" type="QString" value="0"/>
-                <Option name="FilterExpression" type="QString" value=""/>
-                <Option name="Key" type="QString" value="postnumber"/>
-                <Option name="Layer" type="QString" value="ext_address20171204171433160"/>
-                <Option name="OrderByValue" type="QString" value="0"/>
-                <Option name="UseCompleter" type="QString" value="0"/>
-                <Option name="Value" type="QString" value="postnumber"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -18541,50 +18922,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18593,8 +18952,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18603,8 +18962,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18613,8 +18972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18623,8 +18982,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18633,8 +18992,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18643,41 +19002,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -18690,7 +19047,7 @@ def my_form_open(dialog, layer, feature):
         <alias field="featurecat_id" name="featurecat_id" index="4"/>
         <alias field="dma_id" name="dma_id" index="5"/>
         <alias field="macrodma_id" name="macrodma_id" index="6"/>
-        <alias field="presszonecat_id" name="presszonecat_id" index="7"/>
+        <alias field="presszone_id" name="" index="7"/>
         <alias field="state" name="state" index="8"/>
         <alias field="builtdate" name="builtdate" index="9"/>
         <alias field="enddate" name="enddate" index="10"/>
@@ -18716,132 +19073,134 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sample_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="lab_code" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis2_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="place_name" applyOnUpdate="0" expression=""/>
-        <default field="cabinet" applyOnUpdate="0" expression=""/>
-        <default field="observations" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sample_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lab_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis2_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="place_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cabinet" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observations" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sample_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="lab_code" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetaxis2_id" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="place_name" desc="" exp=""/>
-        <constraint field="cabinet" desc="" exp=""/>
-        <constraint field="observations" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sample_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="lab_code" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis2_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="place_name" hidden="0" width="-1" type="field"/>
-          <column name="cabinet" hidden="0" width="-1" type="field"/>
-          <column name="observations" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18873,45 +19232,49 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cabinet"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="lab_code"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observations"/>
-        <field editable="1" name="place_name"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sample_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="streetaxis2_id"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cabinet" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="lab_code" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observations" editable="1"/>
+        <field name="place_name" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sample_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="streetaxis2_id" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -18921,6 +19284,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -18935,7 +19299,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_edit_sector20171204170540567</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_sector" (the_geom) sql=</datasource>
       <keywordList>
@@ -18988,7 +19358,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -19012,144 +19382,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="sector_id" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category render="true" label="0" value="0" symbol="0"/>
-          <category render="true" label="1" value="1" symbol="1"/>
-          <category render="true" label="2" value="2" symbol="2"/>
-          <category render="true" label="3" value="3" symbol="3"/>
-          <category render="true" label="4" value="4" symbol="4"/>
-          <category render="true" label="5" value="5" symbol="5"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19168,21 +19538,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19191,8 +19561,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19201,8 +19571,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19211,8 +19581,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19221,8 +19591,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19231,8 +19601,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19241,8 +19611,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19267,45 +19637,45 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="172" type="field"/>
-          <column name="descript" hidden="0" width="184" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19337,12 +19707,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="name" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -19356,7 +19726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19415,7 +19785,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -19439,33 +19809,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19476,79 +19846,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="postnumber">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="3" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="PointGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -19562,21 +19932,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19585,19 +19955,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19606,43 +19975,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19651,8 +19995,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19661,21 +20005,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19683,7 +20024,10 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -19701,50 +20045,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="plot_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="plot_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="plot_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19776,14 +20120,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="plot_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="streetaxis_id"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="plot_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -19799,7 +20143,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -19858,7 +20202,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -19882,26 +20226,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19919,33 +20263,33 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -19954,8 +20298,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19964,19 +20308,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19985,43 +20328,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20030,8 +20348,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20040,8 +20358,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20050,8 +20368,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20060,8 +20378,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20070,8 +20388,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20080,21 +20398,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20117,66 +20432,66 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="plot_code" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="complement" applyOnUpdate="0" expression=""/>
-        <default field="placement" applyOnUpdate="0" expression=""/>
-        <default field="square" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="complement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="placement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="square" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="plot_code" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="complement" desc="" exp=""/>
-        <constraint field="placement" desc="" exp=""/>
-        <constraint field="square" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="plot_code" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="complement" hidden="0" width="-1" type="field"/>
-          <column name="placement" hidden="0" width="-1" type="field"/>
-          <column name="square" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20208,18 +20523,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="complement"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="placement"/>
-        <field editable="1" name="plot_code"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="square"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="text"/>
+        <field name="complement" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="placement" editable="1"/>
+        <field name="plot_code" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="square" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="complement"/>
@@ -20239,7 +20554,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="3000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiLineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20298,7 +20613,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -20322,31 +20637,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20357,79 +20672,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Arial" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0.1875" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0.1875" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="9" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="0.6" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -20443,21 +20758,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20466,8 +20781,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20476,19 +20791,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20497,8 +20811,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20507,32 +20821,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20541,8 +20851,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -20561,50 +20871,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="269" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20636,14 +20946,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="text"/>
-        <field editable="1" name="type"/>
+        <field name="code" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="text" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="code"/>
@@ -20659,7 +20969,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Polygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -20712,7 +21028,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -20736,26 +21052,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20774,21 +21090,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20797,8 +21113,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20807,8 +21123,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20817,8 +21133,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20827,8 +21143,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20837,8 +21153,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20847,8 +21163,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20865,42 +21181,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="minsector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;minsector_id&quot;">
+      <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20932,12 +21248,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="dma_id"/>
-        <field editable="0" name="dqa_id"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="minsector_id"/>
-        <field editable="0" name="presszonecat_id"/>
-        <field editable="0" name="sector_id"/>
+        <field name="dma_id" editable="0"/>
+        <field name="dqa_id" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="minsector_id" editable="0"/>
+        <field name="presszonecat_id" editable="0"/>
+        <field name="sector_id" editable="0"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -20951,9 +21267,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Line" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21004,7 +21326,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -21028,56 +21350,56 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="76,38,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.7"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="76,38,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.7" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="255,206,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="255,206,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21095,21 +21417,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21152,34 +21474,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21211,10 +21533,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="arc_id"/>
@@ -21226,9 +21548,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21279,7 +21607,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -21303,33 +21631,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="45,84,255,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="0,24,124,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.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="45,84,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,24,124,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21347,21 +21675,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21652,158 +21980,158 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="class" applyOnUpdate="0" expression=""/>
-        <default field="mincut_type" applyOnUpdate="0" expression=""/>
-        <default field="received_date" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_name" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="street_name" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="anl_cause" applyOnUpdate="0" expression=""/>
-        <default field="anl_tstamp" applyOnUpdate="0" expression=""/>
-        <default field="anl_user" applyOnUpdate="0" expression=""/>
-        <default field="anl_descript" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_id" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_type" applyOnUpdate="0" expression=""/>
-        <default field="forecast_start" applyOnUpdate="0" expression=""/>
-        <default field="forecast_end" applyOnUpdate="0" expression=""/>
-        <default field="assigned_to" applyOnUpdate="0" expression=""/>
-        <default field="exec_start" applyOnUpdate="0" expression=""/>
-        <default field="exec_end" applyOnUpdate="0" expression=""/>
-        <default field="exec_user" applyOnUpdate="0" expression=""/>
-        <default field="exec_descript" applyOnUpdate="0" expression=""/>
-        <default field="exec_the_geom" applyOnUpdate="0" expression=""/>
-        <default field="exec_from_plot" applyOnUpdate="0" expression=""/>
-        <default field="exec_depth" applyOnUpdate="0" expression=""/>
-        <default field="exec_appropiate" applyOnUpdate="0" expression=""/>
-        <default field="notified" applyOnUpdate="0" expression=""/>
-        <default field="output" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="mincut_type" expression=""/>
+        <default applyOnUpdate="0" field="received_date" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_name" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="street_name" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="anl_cause" expression=""/>
+        <default applyOnUpdate="0" field="anl_tstamp" expression=""/>
+        <default applyOnUpdate="0" field="anl_user" expression=""/>
+        <default applyOnUpdate="0" field="anl_descript" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_id" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_type" expression=""/>
+        <default applyOnUpdate="0" field="forecast_start" expression=""/>
+        <default applyOnUpdate="0" field="forecast_end" expression=""/>
+        <default applyOnUpdate="0" field="assigned_to" expression=""/>
+        <default applyOnUpdate="0" field="exec_start" expression=""/>
+        <default applyOnUpdate="0" field="exec_end" expression=""/>
+        <default applyOnUpdate="0" field="exec_user" expression=""/>
+        <default applyOnUpdate="0" field="exec_descript" expression=""/>
+        <default applyOnUpdate="0" field="exec_the_geom" expression=""/>
+        <default applyOnUpdate="0" field="exec_from_plot" expression=""/>
+        <default applyOnUpdate="0" field="exec_depth" expression=""/>
+        <default applyOnUpdate="0" field="exec_appropiate" expression=""/>
+        <default applyOnUpdate="0" field="notified" expression=""/>
+        <default applyOnUpdate="0" field="output" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="class" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="mincut_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="received_date" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="street_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_cause" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="assigned_to" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_the_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_from_plot" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_appropiate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="notified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="output" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mincut_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="received_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="street_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_cause" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="assigned_to" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_the_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_from_plot" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_appropiate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="notified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="output" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="class" desc="" exp=""/>
-        <constraint field="mincut_type" desc="" exp=""/>
-        <constraint field="received_date" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="expl_name" desc="" exp=""/>
-        <constraint field="macroexpl_name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="muni_name" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="street_name" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="anl_cause" desc="" exp=""/>
-        <constraint field="anl_tstamp" desc="" exp=""/>
-        <constraint field="anl_user" desc="" exp=""/>
-        <constraint field="anl_descript" desc="" exp=""/>
-        <constraint field="anl_feature_id" desc="" exp=""/>
-        <constraint field="anl_feature_type" desc="" exp=""/>
-        <constraint field="forecast_start" desc="" exp=""/>
-        <constraint field="forecast_end" desc="" exp=""/>
-        <constraint field="assigned_to" desc="" exp=""/>
-        <constraint field="exec_start" desc="" exp=""/>
-        <constraint field="exec_end" desc="" exp=""/>
-        <constraint field="exec_user" desc="" exp=""/>
-        <constraint field="exec_descript" desc="" exp=""/>
-        <constraint field="exec_the_geom" desc="" exp=""/>
-        <constraint field="exec_from_plot" desc="" exp=""/>
-        <constraint field="exec_depth" desc="" exp=""/>
-        <constraint field="exec_appropiate" desc="" exp=""/>
-        <constraint field="notified" desc="" exp=""/>
-        <constraint field="output" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="mincut_type" desc=""/>
+        <constraint exp="" field="received_date" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="expl_name" desc=""/>
+        <constraint exp="" field="macroexpl_name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="muni_name" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="street_name" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="anl_cause" desc=""/>
+        <constraint exp="" field="anl_tstamp" desc=""/>
+        <constraint exp="" field="anl_user" desc=""/>
+        <constraint exp="" field="anl_descript" desc=""/>
+        <constraint exp="" field="anl_feature_id" desc=""/>
+        <constraint exp="" field="anl_feature_type" desc=""/>
+        <constraint exp="" field="forecast_start" desc=""/>
+        <constraint exp="" field="forecast_end" desc=""/>
+        <constraint exp="" field="assigned_to" desc=""/>
+        <constraint exp="" field="exec_start" desc=""/>
+        <constraint exp="" field="exec_end" desc=""/>
+        <constraint exp="" field="exec_user" desc=""/>
+        <constraint exp="" field="exec_descript" desc=""/>
+        <constraint exp="" field="exec_the_geom" desc=""/>
+        <constraint exp="" field="exec_from_plot" desc=""/>
+        <constraint exp="" field="exec_depth" desc=""/>
+        <constraint exp="" field="exec_appropiate" desc=""/>
+        <constraint exp="" field="notified" desc=""/>
+        <constraint exp="" field="output" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="class" hidden="0" width="-1" type="field"/>
-          <column name="mincut_type" hidden="0" width="-1" type="field"/>
-          <column name="received_date" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_name" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="street_name" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="anl_cause" hidden="0" width="-1" type="field"/>
-          <column name="anl_tstamp" hidden="0" width="-1" type="field"/>
-          <column name="anl_user" hidden="0" width="-1" type="field"/>
-          <column name="anl_descript" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_id" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_type" hidden="0" width="-1" type="field"/>
-          <column name="forecast_start" hidden="0" width="-1" type="field"/>
-          <column name="forecast_end" hidden="0" width="-1" type="field"/>
-          <column name="assigned_to" hidden="0" width="-1" type="field"/>
-          <column name="exec_start" hidden="0" width="-1" type="field"/>
-          <column name="exec_end" hidden="0" width="-1" type="field"/>
-          <column name="exec_user" hidden="0" width="-1" type="field"/>
-          <column name="exec_descript" hidden="0" width="-1" type="field"/>
-          <column name="exec_the_geom" hidden="0" width="-1" type="field"/>
-          <column name="exec_from_plot" hidden="0" width="-1" type="field"/>
-          <column name="exec_depth" hidden="0" width="-1" type="field"/>
-          <column name="exec_appropiate" hidden="0" width="-1" type="field"/>
-          <column name="notified" hidden="0" width="-1" type="field"/>
-          <column name="output" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="mincut_type"/>
+          <column type="field" width="-1" hidden="0" name="received_date"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_name"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="street_name"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="anl_cause"/>
+          <column type="field" width="-1" hidden="0" name="anl_tstamp"/>
+          <column type="field" width="-1" hidden="0" name="anl_user"/>
+          <column type="field" width="-1" hidden="0" name="anl_descript"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_id"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_type"/>
+          <column type="field" width="-1" hidden="0" name="forecast_start"/>
+          <column type="field" width="-1" hidden="0" name="forecast_end"/>
+          <column type="field" width="-1" hidden="0" name="assigned_to"/>
+          <column type="field" width="-1" hidden="0" name="exec_start"/>
+          <column type="field" width="-1" hidden="0" name="exec_end"/>
+          <column type="field" width="-1" hidden="0" name="exec_user"/>
+          <column type="field" width="-1" hidden="0" name="exec_descript"/>
+          <column type="field" width="-1" hidden="0" name="exec_the_geom"/>
+          <column type="field" width="-1" hidden="0" name="exec_from_plot"/>
+          <column type="field" width="-1" hidden="0" name="exec_depth"/>
+          <column type="field" width="-1" hidden="0" name="exec_appropiate"/>
+          <column type="field" width="-1" hidden="0" name="notified"/>
+          <column type="field" width="-1" hidden="0" name="output"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21835,41 +22163,41 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="anl_cause"/>
-        <field editable="1" name="anl_descript"/>
-        <field editable="1" name="anl_feature_id"/>
-        <field editable="1" name="anl_feature_type"/>
-        <field editable="1" name="anl_tstamp"/>
-        <field editable="1" name="anl_user"/>
-        <field editable="1" name="assigned_to"/>
-        <field editable="1" name="class"/>
-        <field editable="1" name="exec_appropiate"/>
-        <field editable="1" name="exec_depth"/>
-        <field editable="1" name="exec_descript"/>
-        <field editable="1" name="exec_end"/>
-        <field editable="1" name="exec_from_plot"/>
-        <field editable="1" name="exec_start"/>
-        <field editable="1" name="exec_the_geom"/>
-        <field editable="1" name="exec_user"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="expl_name"/>
-        <field editable="1" name="forecast_end"/>
-        <field editable="1" name="forecast_start"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macroexpl_name"/>
-        <field editable="1" name="mincut_type"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="muni_name"/>
-        <field editable="1" name="notified"/>
-        <field editable="1" name="output"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="received_date"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="street_name"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="anl_cause" editable="1"/>
+        <field name="anl_descript" editable="1"/>
+        <field name="anl_feature_id" editable="1"/>
+        <field name="anl_feature_type" editable="1"/>
+        <field name="anl_tstamp" editable="1"/>
+        <field name="anl_user" editable="1"/>
+        <field name="assigned_to" editable="1"/>
+        <field name="class" editable="1"/>
+        <field name="exec_appropiate" editable="1"/>
+        <field name="exec_depth" editable="1"/>
+        <field name="exec_descript" editable="1"/>
+        <field name="exec_end" editable="1"/>
+        <field name="exec_from_plot" editable="1"/>
+        <field name="exec_start" editable="1"/>
+        <field name="exec_the_geom" editable="1"/>
+        <field name="exec_user" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="expl_name" editable="1"/>
+        <field name="forecast_end" editable="1"/>
+        <field name="forecast_start" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macroexpl_name" editable="1"/>
+        <field name="mincut_type" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="muni_name" editable="1"/>
+        <field name="notified" editable="1"/>
+        <field name="output" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="received_date" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="street_name" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="anl_cause"/>
@@ -21912,9 +22240,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>expl_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21965,7 +22299,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -21989,33 +22323,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="176,123,103,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="102,46,25,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="176,123,103,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="102,46,25,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22033,21 +22367,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22098,38 +22432,38 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22161,11 +22495,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="connec_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -22178,9 +22512,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22231,7 +22571,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -22255,33 +22595,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="241,209,66,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="160,134,17,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="241,209,66,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="160,134,17,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22299,21 +22639,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22356,34 +22696,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22415,10 +22755,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -22430,9 +22770,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22483,7 +22829,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -22507,97 +22853,97 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="proposed" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="proposed" symbollevels="0">
         <categories>
-          <category render="true" label="Proposed to close" value="true" symbol="0"/>
-          <category render="true" label="Do not operate" value="false" symbol="1"/>
+          <category render="true" value="true" label="Proposed to close" symbol="0"/>
+          <category render="true" value="false" label="Do not operate" symbol="1"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,55,58,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="134,13,13,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,55,58,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="134,13,13,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="51,160,44,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="6,94,0,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="51,160,44,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="6,94,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="232,113,141,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="232,113,141,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22615,21 +22961,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22704,50 +23050,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="closed" applyOnUpdate="0" expression=""/>
-        <default field="broken" applyOnUpdate="0" expression=""/>
-        <default field="unaccess" applyOnUpdate="0" expression=""/>
-        <default field="proposed" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="unaccess" expression=""/>
+        <default applyOnUpdate="0" field="proposed" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="closed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="broken" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="unaccess" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="proposed" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="unaccess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="proposed" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="closed" desc="" exp=""/>
-        <constraint field="broken" desc="" exp=""/>
-        <constraint field="unaccess" desc="" exp=""/>
-        <constraint field="proposed" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="unaccess" desc=""/>
+        <constraint exp="" field="proposed" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="closed" hidden="0" width="-1" type="field"/>
-          <column name="broken" hidden="0" width="-1" type="field"/>
-          <column name="unaccess" hidden="0" width="-1" type="field"/>
-          <column name="proposed" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="unaccess"/>
+          <column type="field" width="-1" hidden="0" name="proposed"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22779,14 +23125,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="broken"/>
-        <field editable="1" name="closed"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="proposed"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="unaccess"/>
-        <field editable="1" name="work_order"/>
+        <field name="broken" editable="1"/>
+        <field name="closed" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="proposed" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="unaccess" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="broken"/>
@@ -22802,7 +23148,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc20180206173632206</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc" (the_geom) sql=</datasource>
       <keywordList>
@@ -22862,162 +23208,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -23025,49 +23371,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -23080,27 +23426,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="arc_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23109,8 +23455,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23258,94 +23604,94 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="max_flow" applyOnUpdate="0" expression=""/>
-        <default field="min_flow" applyOnUpdate="0" expression=""/>
-        <default field="max_vel" applyOnUpdate="0" expression=""/>
-        <default field="min_vel" applyOnUpdate="0" expression=""/>
-        <default field="max_headloss" applyOnUpdate="0" expression=""/>
-        <default field="min_headloss" applyOnUpdate="0" expression=""/>
-        <default field="max_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="min_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="max_setting" applyOnUpdate="0" expression=""/>
-        <default field="min_setting" applyOnUpdate="0" expression=""/>
-        <default field="max_reaction" applyOnUpdate="0" expression=""/>
-        <default field="min_reaction" applyOnUpdate="0" expression=""/>
-        <default field="max_ffactor" applyOnUpdate="0" expression=""/>
-        <default field="min_ffactor" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="max_flow" desc="" exp=""/>
-        <constraint field="min_flow" desc="" exp=""/>
-        <constraint field="max_vel" desc="" exp=""/>
-        <constraint field="min_vel" desc="" exp=""/>
-        <constraint field="max_headloss" desc="" exp=""/>
-        <constraint field="min_headloss" desc="" exp=""/>
-        <constraint field="max_uheadloss" desc="" exp=""/>
-        <constraint field="min_uheadloss" desc="" exp=""/>
-        <constraint field="max_setting" desc="" exp=""/>
-        <constraint field="min_setting" desc="" exp=""/>
-        <constraint field="max_reaction" desc="" exp=""/>
-        <constraint field="min_reaction" desc="" exp=""/>
-        <constraint field="max_ffactor" desc="" exp=""/>
-        <constraint field="min_ffactor" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="max_flow" hidden="0" width="-1" type="field"/>
-          <column name="min_flow" hidden="0" width="-1" type="field"/>
-          <column name="max_vel" hidden="0" width="-1" type="field"/>
-          <column name="min_vel" hidden="0" width="-1" type="field"/>
-          <column name="max_headloss" hidden="0" width="-1" type="field"/>
-          <column name="min_headloss" hidden="0" width="-1" type="field"/>
-          <column name="max_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="min_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="max_setting" hidden="0" width="-1" type="field"/>
-          <column name="min_setting" hidden="0" width="-1" type="field"/>
-          <column name="max_reaction" hidden="0" width="-1" type="field"/>
-          <column name="min_reaction" hidden="0" width="-1" type="field"/>
-          <column name="max_ffactor" hidden="0" width="-1" type="field"/>
-          <column name="min_ffactor" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23377,31 +23723,31 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="arc_type"/>
-        <field editable="0" name="arccat_id"/>
-        <field editable="0" name="max_ffactor"/>
-        <field editable="0" name="max_flow"/>
-        <field editable="0" name="max_headloss"/>
-        <field editable="0" name="max_reaction"/>
-        <field editable="0" name="max_setting"/>
-        <field editable="0" name="max_uheadloss"/>
-        <field editable="0" name="max_vel"/>
-        <field editable="0" name="min_ffactor"/>
-        <field editable="0" name="min_flow"/>
-        <field editable="0" name="min_headloss"/>
-        <field editable="0" name="min_reaction"/>
-        <field editable="0" name="min_setting"/>
-        <field editable="0" name="min_uheadloss"/>
-        <field editable="0" name="min_vel"/>
-        <field editable="0" name="result_id"/>
+        <field name="arc_id" editable="0"/>
+        <field name="arc_type" editable="0"/>
+        <field name="arccat_id" editable="0"/>
+        <field name="max_ffactor" editable="0"/>
+        <field name="max_flow" editable="0"/>
+        <field name="max_headloss" editable="0"/>
+        <field name="max_reaction" editable="0"/>
+        <field name="max_setting" editable="0"/>
+        <field name="max_uheadloss" editable="0"/>
+        <field name="max_vel" editable="0"/>
+        <field name="min_ffactor" editable="0"/>
+        <field name="min_flow" editable="0"/>
+        <field name="min_headloss" editable="0"/>
+        <field name="min_reaction" editable="0"/>
+        <field name="min_setting" editable="0"/>
+        <field name="min_uheadloss" editable="0"/>
+        <field name="min_vel" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_all20180309112714512</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -23461,31 +23807,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="20,173,40,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="20,173,40,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23498,7 +23844,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23514,8 +23860,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23600,60 +23946,60 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="vel" applyOnUpdate="0" expression=""/>
-        <default field="headloss" applyOnUpdate="0" expression=""/>
-        <default field="setting" applyOnUpdate="0" expression=""/>
-        <default field="ffactor" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="vel" desc="" exp=""/>
-        <constraint field="headloss" desc="" exp=""/>
-        <constraint field="setting" desc="" exp=""/>
-        <constraint field="ffactor" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="flow" hidden="0" width="-1" type="field"/>
-          <column name="vel" hidden="0" width="-1" type="field"/>
-          <column name="headloss" hidden="0" width="-1" type="field"/>
-          <column name="setting" hidden="0" width="-1" type="field"/>
-          <column name="ffactor" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23669,24 +24015,24 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="arc_type"/>
-        <field editable="0" name="arccat_id"/>
-        <field editable="0" name="ffactor"/>
-        <field editable="0" name="flow"/>
-        <field editable="0" name="headloss"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="setting"/>
-        <field editable="0" name="time"/>
-        <field editable="0" name="vel"/>
+        <field name="arc_id" editable="0"/>
+        <field name="arc_type" editable="0"/>
+        <field name="arccat_id" editable="0"/>
+        <field name="ffactor" editable="0"/>
+        <field name="flow" editable="0"/>
+        <field name="headloss" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="setting" editable="0"/>
+        <field name="time" editable="0"/>
+        <field name="vel" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_hourly20180309112714378</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -23746,162 +24092,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -23909,49 +24255,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -23964,27 +24310,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24000,8 +24346,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24070,58 +24416,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="vel" applyOnUpdate="0" expression=""/>
-        <default field="headloss" applyOnUpdate="0" expression=""/>
-        <default field="setting" applyOnUpdate="0" expression=""/>
-        <default field="ffactor" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="vel" desc="" exp=""/>
-        <constraint field="headloss" desc="" exp=""/>
-        <constraint field="setting" desc="" exp=""/>
-        <constraint field="ffactor" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{bc968d00-0198-4e46-9f58-2fe359b28284}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{bc968d00-0198-4e46-9f58-2fe359b28284}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="flow" hidden="0" width="-1" type="field"/>
-          <column name="vel" hidden="0" width="-1" type="field"/>
-          <column name="headloss" hidden="0" width="-1" type="field"/>
-          <column name="setting" hidden="0" width="-1" type="field"/>
-          <column name="ffactor" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24153,22 +24499,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="ffactor"/>
-        <field editable="0" name="flow"/>
-        <field editable="0" name="headloss"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="setting"/>
-        <field editable="0" name="time"/>
-        <field editable="0" name="vel"/>
+        <field name="arc_id" editable="0"/>
+        <field name="ffactor" editable="0"/>
+        <field name="flow" editable="0"/>
+        <field name="headloss" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="setting" editable="0"/>
+        <field name="time" editable="0"/>
+        <field name="vel" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc20160710012004554</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_arc</shortname>
@@ -24222,174 +24568,174 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <map-layer-style-manager current="arc maxheadloss">
         <map-layer-style name="% arc headloss">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_uheadloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_uheadloss" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.5 %" lower="0.000000000000000" upper="0.500000000000000" symbol="0"/>
-                <range render="true" label=" 0.5 - 1.0 %" lower="0.500000000000000" upper="1.000000000000000" symbol="1"/>
-                <range render="true" label=" 1.0 - 10.0 %" lower="1.000000000000000" upper="10.000000000000000" symbol="2"/>
-                <range render="true" label="> 10.0 %" lower="10.000000000000000" upper="100.000000000000000" symbol="3"/>
+                <range upper="0.500000000000000" render="true" lower="0.000000000000000" label="&lt; 0.5 %" symbol="0"/>
+                <range upper="1.000000000000000" render="true" lower="0.500000000000000" label=" 0.5 - 1.0 %" symbol="1"/>
+                <range upper="10.000000000000000" render="true" lower="1.000000000000000" label=" 1.0 - 10.0 %" symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="10.000000000000000" label="> 10.0 %" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="1" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="1" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -24542,34 +24888,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -24603,174 +24949,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="arc maxflow">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="-4.65661e-10" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_flow" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_flow" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.50 l/s" lower="-0.290000000000000" upper="0.500000000000000" symbol="0"/>
-                <range render="true" label="0.50 - 1.50 l/s" lower="0.500000000000000" upper="1.500000000000000" symbol="1"/>
-                <range render="true" label="1.50 - 2.50 l/s " lower="1.500000000000000" upper="2.500000000000000" symbol="2"/>
-                <range render="true" label="> 2.5 l/s" lower="2.500000000000000" upper="100.000000000000000" symbol="3"/>
+                <range upper="0.500000000000000" render="true" lower="-0.290000000000000" label="&lt; 0.50 l/s" symbol="0"/>
+                <range upper="1.500000000000000" render="true" lower="0.500000000000000" label="0.50 - 1.50 l/s" symbol="1"/>
+                <range upper="2.500000000000000" render="true" lower="1.500000000000000" label="1.50 - 2.50 l/s " symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="2.500000000000000" label="> 2.5 l/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="2" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -24923,34 +25269,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -24985,174 +25331,174 @@ def my_form_open(dialog, layer, feature):
         </map-layer-style>
         <map-layer-style name="arc maxheadloss"/>
         <map-layer-style name="arc maxvelocity">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_vel" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_vel" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.15 m/s" lower="0.000000000000000" upper="0.150000000000000" symbol="0"/>
-                <range render="true" label=" 0.15 - 0.30 m/s" lower="0.150000000000000" upper="0.300000000000000" symbol="1"/>
-                <range render="true" label=" 0.30 - 0.45 m/s " lower="0.300000000000000" upper="0.450000000000000" symbol="2"/>
-                <range render="true" label="> 0.45 m/s" lower="0.450000000000000" upper="2.000000000000000" symbol="3"/>
+                <range upper="0.150000000000000" render="true" lower="0.000000000000000" label="&lt; 0.15 m/s" symbol="0"/>
+                <range upper="0.300000000000000" render="true" lower="0.150000000000000" label=" 0.15 - 0.30 m/s" symbol="1"/>
+                <range upper="0.450000000000000" render="true" lower="0.300000000000000" label=" 0.30 - 0.45 m/s " symbol="2"/>
+                <range upper="2.000000000000000" render="true" lower="0.450000000000000" label="> 0.45 m/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="2" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -25305,34 +25651,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -25366,174 +25712,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="predeterminado">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="-4.65661e-10" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.06" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-                <range render="true" label=" 0.06 - 0.12" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-                <range render="true" label=" 0.10 - 0.18" lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-                <range render="true" label=" > 0.18" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+                <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06" symbol="0"/>
+                <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12" symbol="1"/>
+                <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.10 - 0.18" symbol="2"/>
+                <range upper="200.000000000000000" render="true" lower="0.180000000000000" label=" > 0.18" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="0" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="0" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -25686,34 +26032,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -25753,162 +26099,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -25916,49 +26262,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -25971,27 +26317,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="arc_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26000,8 +26346,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -26133,86 +26479,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="max_flow" applyOnUpdate="0" expression=""/>
-        <default field="min_flow" applyOnUpdate="0" expression=""/>
-        <default field="max_vel" applyOnUpdate="0" expression=""/>
-        <default field="min_vel" applyOnUpdate="0" expression=""/>
-        <default field="max_headloss" applyOnUpdate="0" expression=""/>
-        <default field="min_headloss" applyOnUpdate="0" expression=""/>
-        <default field="max_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="min_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="max_setting" applyOnUpdate="0" expression=""/>
-        <default field="min_setting" applyOnUpdate="0" expression=""/>
-        <default field="max_reaction" applyOnUpdate="0" expression=""/>
-        <default field="min_reaction" applyOnUpdate="0" expression=""/>
-        <default field="max_ffactor" applyOnUpdate="0" expression=""/>
-        <default field="min_ffactor" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="max_flow" desc="" exp=""/>
-        <constraint field="min_flow" desc="" exp=""/>
-        <constraint field="max_vel" desc="" exp=""/>
-        <constraint field="min_vel" desc="" exp=""/>
-        <constraint field="max_headloss" desc="" exp=""/>
-        <constraint field="min_headloss" desc="" exp=""/>
-        <constraint field="max_uheadloss" desc="" exp=""/>
-        <constraint field="min_uheadloss" desc="" exp=""/>
-        <constraint field="max_setting" desc="" exp=""/>
-        <constraint field="min_setting" desc="" exp=""/>
-        <constraint field="max_reaction" desc="" exp=""/>
-        <constraint field="min_reaction" desc="" exp=""/>
-        <constraint field="max_ffactor" desc="" exp=""/>
-        <constraint field="min_ffactor" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="max_flow" hidden="0" width="-1" type="field"/>
-          <column name="min_flow" hidden="0" width="-1" type="field"/>
-          <column name="max_vel" hidden="0" width="-1" type="field"/>
-          <column name="min_vel" hidden="0" width="-1" type="field"/>
-          <column name="max_headloss" hidden="0" width="-1" type="field"/>
-          <column name="min_headloss" hidden="0" width="-1" type="field"/>
-          <column name="max_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="min_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="max_setting" hidden="0" width="-1" type="field"/>
-          <column name="min_setting" hidden="0" width="-1" type="field"/>
-          <column name="max_reaction" hidden="0" width="-1" type="field"/>
-          <column name="min_reaction" hidden="0" width="-1" type="field"/>
-          <column name="max_ffactor" hidden="0" width="-1" type="field"/>
-          <column name="min_ffactor" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26244,29 +26590,29 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="max_ffactor"/>
-        <field editable="0" name="max_flow"/>
-        <field editable="0" name="max_headloss"/>
-        <field editable="0" name="max_reaction"/>
-        <field editable="0" name="max_setting"/>
-        <field editable="0" name="max_uheadloss"/>
-        <field editable="0" name="max_vel"/>
-        <field editable="0" name="min_ffactor"/>
-        <field editable="0" name="min_flow"/>
-        <field editable="0" name="min_headloss"/>
-        <field editable="0" name="min_reaction"/>
-        <field editable="0" name="min_setting"/>
-        <field editable="0" name="min_uheadloss"/>
-        <field editable="0" name="min_vel"/>
-        <field editable="0" name="result_id"/>
+        <field name="arc_id" editable="0"/>
+        <field name="max_ffactor" editable="0"/>
+        <field name="max_flow" editable="0"/>
+        <field name="max_headloss" editable="0"/>
+        <field name="max_reaction" editable="0"/>
+        <field name="max_setting" editable="0"/>
+        <field name="max_uheadloss" editable="0"/>
+        <field name="max_vel" editable="0"/>
+        <field name="min_ffactor" editable="0"/>
+        <field name="min_flow" editable="0"/>
+        <field name="min_headloss" editable="0"/>
+        <field name="min_reaction" editable="0"/>
+        <field name="min_setting" editable="0"/>
+        <field name="min_uheadloss" editable="0"/>
+        <field name="min_vel" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc_hourly20180309112714639</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -26326,162 +26672,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -26489,49 +26835,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -26544,27 +26890,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26580,8 +26926,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -26650,58 +26996,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="vel" applyOnUpdate="0" expression=""/>
-        <default field="headloss" applyOnUpdate="0" expression=""/>
-        <default field="setting" applyOnUpdate="0" expression=""/>
-        <default field="ffactor" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="vel" desc="" exp=""/>
-        <constraint field="headloss" desc="" exp=""/>
-        <constraint field="setting" desc="" exp=""/>
-        <constraint field="ffactor" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="flow" hidden="0" width="-1" type="field"/>
-          <column name="vel" hidden="0" width="-1" type="field"/>
-          <column name="headloss" hidden="0" width="-1" type="field"/>
-          <column name="setting" hidden="0" width="-1" type="field"/>
-          <column name="ffactor" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26733,22 +27079,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="ffactor"/>
-        <field editable="0" name="flow"/>
-        <field editable="0" name="headloss"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="setting"/>
-        <field editable="0" name="time"/>
-        <field editable="0" name="vel"/>
+        <field name="arc_id" editable="0"/>
+        <field name="ffactor" editable="0"/>
+        <field name="flow" editable="0"/>
+        <field name="headloss" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="setting" editable="0"/>
+        <field name="time" editable="0"/>
+        <field name="vel" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_energy_usage20160710012004617</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_energy_usage" sql=</datasource>
       <shortname>v_rpt_comp_energy_usage</shortname>
@@ -26810,7 +27156,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26847,8 +27193,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -26896,52 +27242,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="nodarc_id" applyOnUpdate="0" expression=""/>
-        <default field="usage_fact" applyOnUpdate="0" expression=""/>
-        <default field="avg_effic" applyOnUpdate="0" expression=""/>
-        <default field="kwhr_mgal" applyOnUpdate="0" expression=""/>
-        <default field="avg_kw" applyOnUpdate="0" expression=""/>
-        <default field="peak_kw" applyOnUpdate="0" expression=""/>
-        <default field="cost_day" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodarc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="usage_fact" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_effic" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="kwhr_mgal" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="peak_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost_day" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="nodarc_id" desc="" exp=""/>
-        <constraint field="usage_fact" desc="" exp=""/>
-        <constraint field="avg_effic" desc="" exp=""/>
-        <constraint field="kwhr_mgal" desc="" exp=""/>
-        <constraint field="avg_kw" desc="" exp=""/>
-        <constraint field="peak_kw" desc="" exp=""/>
-        <constraint field="cost_day" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="nodarc_id" hidden="0" width="-1" type="field"/>
-          <column name="usage_fact" hidden="0" width="-1" type="field"/>
-          <column name="avg_effic" hidden="0" width="-1" type="field"/>
-          <column name="kwhr_mgal" hidden="0" width="-1" type="field"/>
-          <column name="avg_kw" hidden="0" width="-1" type="field"/>
-          <column name="peak_kw" hidden="0" width="-1" type="field"/>
-          <column name="cost_day" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26957,22 +27303,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="avg_effic"/>
-        <field editable="0" name="avg_kw"/>
-        <field editable="0" name="cost_day"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="kwhr_mgal"/>
-        <field editable="0" name="nodarc_id"/>
-        <field editable="0" name="peak_kw"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="usage_fact"/>
+        <field name="avg_effic" editable="0"/>
+        <field name="avg_kw" editable="0"/>
+        <field name="cost_day" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="kwhr_mgal" editable="0"/>
+        <field name="nodarc_id" editable="0"/>
+        <field name="peak_kw" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="usage_fact" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_hydraulic_status20160710012004648</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_hydraulic_status" sql=</datasource>
       <shortname>v_rpt_comp_hydraulic_status</shortname>
@@ -27034,7 +27380,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27043,8 +27389,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -27080,32 +27426,32 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27121,17 +27467,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="text"/>
-        <field editable="0" name="time"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="text" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node20160710012004695</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_node</shortname>
@@ -27192,202 +27538,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -27395,49 +27741,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -27450,27 +27796,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27585,64 +27931,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="0" width="-1" type="field"/>
-          <column name="min_head" hidden="0" width="-1" type="field"/>
-          <column name="min_pressure" hidden="0" width="-1" type="field"/>
-          <column name="min_quality" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="min_demand"/>
+          <column type="field" width="-1" hidden="0" name="min_head"/>
+          <column type="field" width="-1" hidden="0" name="min_pressure"/>
+          <column type="field" width="-1" hidden="0" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27674,26 +28020,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="max_demand"/>
-        <field editable="0" name="max_head"/>
-        <field editable="0" name="max_pressure"/>
-        <field editable="0" name="max_quality"/>
-        <field editable="0" name="min_demand"/>
-        <field editable="0" name="min_head"/>
-        <field editable="0" name="min_pressure"/>
-        <field editable="0" name="min_quality"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="result_id"/>
+        <field name="elevation" editable="0"/>
+        <field name="max_demand" editable="0"/>
+        <field name="max_head" editable="0"/>
+        <field name="max_pressure" editable="0"/>
+        <field name="max_quality" editable="0"/>
+        <field name="min_demand" editable="0"/>
+        <field name="min_head" editable="0"/>
+        <field name="min_pressure" editable="0"/>
+        <field name="min_quality" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_copiar20161230144859228</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -27753,202 +28099,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -27956,49 +28302,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -28011,27 +28357,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -28040,8 +28386,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28050,8 +28396,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28060,8 +28406,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28070,8 +28416,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28080,8 +28426,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28090,8 +28436,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28107,8 +28453,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28124,8 +28470,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28141,8 +28487,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28173,64 +28519,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{5b334259-4694-4093-810f-160d8a437c1d}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5b334259-4694-4093-810f-160d8a437c1d}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28267,7 +28613,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_hourly20180309112714764</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -28327,33 +28673,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="211,184,132,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="211,184,132,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28366,7 +28712,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -28403,8 +28749,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28452,52 +28798,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="press" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="press" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="press" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="demand" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="press" hidden="0" width="-1" type="field"/>
-          <column name="quality" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="press"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28513,22 +28859,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="demand"/>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="head"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="press"/>
-        <field editable="0" name="quality"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="time"/>
+        <field name="demand" editable="0"/>
+        <field name="elevation" editable="0"/>
+        <field name="head" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="press" editable="0"/>
+        <field name="quality" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_energy_usage20180201122650430</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_energy_usage" sql=</datasource>
       <keywordList>
@@ -28589,7 +28935,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -28626,8 +28972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28675,52 +29021,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="nodarc_id" applyOnUpdate="0" expression=""/>
-        <default field="usage_fact" applyOnUpdate="0" expression=""/>
-        <default field="avg_effic" applyOnUpdate="0" expression=""/>
-        <default field="kwhr_mgal" applyOnUpdate="0" expression=""/>
-        <default field="avg_kw" applyOnUpdate="0" expression=""/>
-        <default field="peak_kw" applyOnUpdate="0" expression=""/>
-        <default field="cost_day" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodarc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="usage_fact" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_effic" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="kwhr_mgal" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="peak_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost_day" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="nodarc_id" desc="" exp=""/>
-        <constraint field="usage_fact" desc="" exp=""/>
-        <constraint field="avg_effic" desc="" exp=""/>
-        <constraint field="kwhr_mgal" desc="" exp=""/>
-        <constraint field="avg_kw" desc="" exp=""/>
-        <constraint field="peak_kw" desc="" exp=""/>
-        <constraint field="cost_day" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="nodarc_id" hidden="0" width="-1" type="field"/>
-          <column name="usage_fact" hidden="0" width="-1" type="field"/>
-          <column name="avg_effic" hidden="0" width="-1" type="field"/>
-          <column name="kwhr_mgal" hidden="0" width="-1" type="field"/>
-          <column name="avg_kw" hidden="0" width="-1" type="field"/>
-          <column name="peak_kw" hidden="0" width="-1" type="field"/>
-          <column name="cost_day" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28736,22 +29082,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="avg_effic"/>
-        <field editable="0" name="avg_kw"/>
-        <field editable="0" name="cost_day"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="kwhr_mgal"/>
-        <field editable="0" name="nodarc_id"/>
-        <field editable="0" name="peak_kw"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="usage_fact"/>
+        <field name="avg_effic" editable="0"/>
+        <field name="avg_kw" editable="0"/>
+        <field name="cost_day" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="kwhr_mgal" editable="0"/>
+        <field name="nodarc_id" editable="0"/>
+        <field name="peak_kw" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="usage_fact" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_hydraulic_status20131203141738132</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_hydraulic_status" sql=</datasource>
       <keywordList>
@@ -28812,7 +29158,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -28821,8 +29167,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -28858,38 +29204,38 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" notificationMessage="" id="{678b4af2-e189-408a-baf7-c84b798c5250}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{678b4af2-e189-408a-baf7-c84b798c5250}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28905,17 +29251,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="text"/>
-        <field editable="0" name="time"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="text" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node20180206173632034</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -28975,202 +29321,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="min_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="min_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -29178,49 +29524,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="60,60,60,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="60,60,60,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="1.5" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -29233,27 +29579,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29368,64 +29714,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="max_demand" hidden="0" width="-1" type="field"/>
-          <column name="max_head" hidden="0" width="-1" type="field"/>
-          <column name="max_pressure" hidden="0" width="-1" type="field"/>
-          <column name="max_quality" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="max_demand"/>
+          <column type="field" width="-1" hidden="0" name="max_head"/>
+          <column type="field" width="-1" hidden="0" name="max_pressure"/>
+          <column type="field" width="-1" hidden="0" name="max_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29457,26 +29803,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="max_demand"/>
-        <field editable="0" name="max_head"/>
-        <field editable="0" name="max_pressure"/>
-        <field editable="0" name="max_quality"/>
-        <field editable="0" name="min_demand"/>
-        <field editable="0" name="min_head"/>
-        <field editable="0" name="min_pressure"/>
-        <field editable="0" name="min_quality"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="result_id"/>
+        <field name="elevation" editable="0"/>
+        <field name="max_demand" editable="0"/>
+        <field name="max_head" editable="0"/>
+        <field name="max_pressure" editable="0"/>
+        <field name="max_quality" editable="0"/>
+        <field name="min_demand" editable="0"/>
+        <field name="min_head" editable="0"/>
+        <field name="min_pressure" editable="0"/>
+        <field name="min_quality" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "node_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_all20180309112714890</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -29536,202 +29882,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -29739,49 +30085,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -29794,27 +30140,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29865,8 +30211,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -29916,58 +30262,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="press" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="press" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="press" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29999,24 +30345,24 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="demand"/>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="head"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="press"/>
-        <field editable="0" name="quality"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="time"/>
+        <field name="demand" editable="0"/>
+        <field name="elevation" editable="0"/>
+        <field name="head" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="press" editable="0"/>
+        <field name="quality" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_hourly20180309112715024</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -30076,202 +30422,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -30279,49 +30625,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -30334,27 +30680,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30391,8 +30737,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -30440,52 +30786,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="press" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="press" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="press" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30517,22 +30863,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="demand"/>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="head"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="press"/>
-        <field editable="0" name="quality"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="time"/>
+        <field name="demand" editable="0"/>
+        <field name="elevation" editable="0"/>
+        <field name="head" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="press" editable="0"/>
+        <field name="quality" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -30591,7 +30937,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30615,26 +30961,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30652,27 +30998,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -30699,26 +31045,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30750,8 +31096,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="connec_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -30761,7 +31107,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -30820,7 +31166,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -30844,26 +31190,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30881,27 +31227,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -30928,26 +31274,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30979,8 +31325,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -30990,7 +31336,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -31049,7 +31395,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -31073,26 +31419,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31110,27 +31456,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -31157,26 +31503,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31208,8 +31554,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -31278,14 +31624,14 @@ def my_form_open(dialog, layer, feature):
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -31976,63 +32322,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="composer_plan" units="mm" worldFileMap="" printResolution="300">
-      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
-      <Grid offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" referencePoint="0" groupUuid="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" blendMode="0" position="0,0,mm" zValue="0" frameJoinStyle="miter" visibility="1" id="" size="210,297,mm" positionOnPage="0,0,mm" itemRotation="0" background="true">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32040,446 +32386,446 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" svgBorderWidth="0.2" frame="false" anchorPoint="0" pictureWidth="8.01076" excludeFromExports="0" svgBorderColor="0,0,0,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" pictureRotation="0" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" resizeMode="0" blendMode="0" position="21.2488,12.0899,mm" zValue="34" pictureHeight="8.05991" frameJoinStyle="miter" mapUuid="" visibility="1" svgFillColor="255,255,255,255" id="" size="52.9371,8.05991,mm" northMode="0" positionOnPage="21.2488,12.0899,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" labelText="Planified network:  [% &quot;plan_length&quot; %] m." halign="1" blendMode="0" position="18.5098,248.929,mm" zValue="34" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,248.929,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" labelText="Affected network:  [% &quot;affec_length&quot; %] m." halign="1" blendMode="0" position="18.5098,240.85,mm" zValue="33" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,240.85,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" halign="2" blendMode="0" position="130.06,170.278,mm" zValue="32" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="130.06,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" halign="2" blendMode="0" position="129.892,162.595,mm" zValue="31" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.892,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" halign="2" blendMode="0" position="129.892,154.849,mm" zValue="30" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.892,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" blendMode="0" position="18.5119,237.417,mm" zValue="29" frameJoinStyle="miter" visibility="1" id="" size="107.352,0.232607,mm" positionOnPage="18.5119,237.417,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" labelText="Total cost of other works:" halign="1" blendMode="0" position="18.472,170.278,mm" zValue="28" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.07458,mm" positionOnPage="18.472,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" blendMode="0" position="18.472,180.075,mm" zValue="27" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,180.075,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,191.26,mm" zValue="26" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.798,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,184.169,mm" zValue="25" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.798,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" halign="1" blendMode="0" position="18.5098,144.841,mm" zValue="24" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="97.7075,5.87319,mm" positionOnPage="18.5098,144.841,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" labelText="Total cost for node elements:" halign="1" blendMode="0" position="18.472,162.595,mm" zValue="23" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.87319,mm" positionOnPage="18.472,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" blendMode="0" position="18.4712,202.127,mm" zValue="22" frameJoinStyle="miter" visibility="1" id="" size="178.105,0.232607,mm" positionOnPage="18.4712,202.127,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" blendMode="0" position="18.472,149.994,mm" zValue="21" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,149.994,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" blendMode="0" position="17.1613,8.922,mm" zValue="19" frameJoinStyle="miter" visibility="1" id="" size="0.851544,16.1039,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" blendMode="0" position="17.1613,8.922,mm" zValue="18" frameJoinStyle="miter" visibility="1" id="" size="179.415,0.863719,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="true" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" mapFlags="0" blendMode="0" position="131.014,237.517,mm" zValue="17" frameJoinStyle="miter" visibility="1" followPreset="false" id="" size="65.4621,46.5539,mm" keepLayerSet="true" positionOnPage="131.014,237.517,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4577071.35527538601309061" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymin="4576100.62452332023531199"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" layerid="ext_municipality20171204170633784">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -32639,66 +32985,66 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="muni_id" name="" index="0"/>
-                <alias field="name" name="" index="1"/>
-                <alias field="observ" name="" index="2"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="name" hidden="0" width="183" type="field"/>
-                  <column name="observ" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -32730,442 +33076,442 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="muni_id" expression=""/>
-                <default field="name" expression=""/>
-                <default field="observ" expression=""/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="name"/>
+                <default expression="" field="observ"/>
               </defaults>
               <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_dimensions20170628134034849">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-                  <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-                  <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol name="@2@1" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@2@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol name="@2@3" alpha="1" clip_to_extent="1" type="fill">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleFill">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol name="@2@4" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -33174,143 +33520,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule scalemindenom="1" key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -33470,88 +33816,88 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="distance" name="" index="1"/>
-                <alias field="depth" name="" index="2"/>
-                <alias field="x_label" name="" index="3"/>
-                <alias field="y_label" name="" index="4"/>
-                <alias field="rotation_label" name="" index="5"/>
-                <alias field="offset_label" name="" index="6"/>
-                <alias field="direction_arrow" name="" index="7"/>
-                <alias field="x_symbol" name="" index="8"/>
-                <alias field="y_symbol" name="" index="9"/>
-                <alias field="feature_id" name="" index="10"/>
-                <alias field="feature_type" name="" index="11"/>
-                <alias field="state" name="" index="12"/>
-                <alias field="expl_id" name="" index="13"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+              <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="distance" hidden="0" width="-1" type="field"/>
-                  <column name="depth" hidden="0" width="-1" type="field"/>
-                  <column name="x_label" hidden="0" width="-1" type="field"/>
-                  <column name="y_label" hidden="0" width="-1" type="field"/>
-                  <column name="rotation_label" hidden="0" width="-1" type="field"/>
-                  <column name="offset_label" hidden="0" width="-1" type="field"/>
-                  <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-                  <column name="x_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="y_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="feature_id" hidden="0" width="-1" type="field"/>
-                  <column name="feature_type" hidden="0" width="-1" type="field"/>
-                  <column name="state" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -33583,151 +33929,151 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="distance" expression=""/>
-                <default field="depth" expression=""/>
-                <default field="x_label" expression=""/>
-                <default field="y_label" expression=""/>
-                <default field="rotation_label" expression=""/>
-                <default field="offset_label" expression=""/>
-                <default field="direction_arrow" expression=""/>
-                <default field="x_symbol" expression=""/>
-                <default field="y_symbol" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="feature_type" expression=""/>
-                <default field="state" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="distance"/>
+                <default expression="" field="depth"/>
+                <default expression="" field="x_label"/>
+                <default expression="" field="y_label"/>
+                <default expression="" field="rotation_label"/>
+                <default expression="" field="offset_label"/>
+                <default expression="" field="direction_arrow"/>
+                <default expression="" field="x_symbol"/>
+                <default expression="" field="y_symbol"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="feature_type"/>
+                <default expression="" field="state"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_samplepoint20170619120830016">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="dma_id" notNull="0" Layer="v_edit_dma20180201085045064" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_state20160216123517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="muni_id" notNull="0" Layer="ext_municipality20171204170633784" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="ext_streetaxis20160528211138508" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="postnumber" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="postnumber" notNull="0" Layer="ext_address20171204171433160" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_verified20160216164517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="expl_id" notNull="0" Layer="exploitation20180122152954062" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                     <layer locked="0" pass="0" class="FontMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -33887,85 +34233,85 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer classificationAttributeExpression="" upperValue="0" attributeLegend="1" upperHeight="50" lowerValue="0" diagramType="Histogram" lowerWidth="0" upperWidth="50" sizeLegend="0" lowerHeight="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="sample_id" name="" index="0"/>
-                <alias field="code" name="" index="1"/>
-                <alias field="lab_code" name="" index="2"/>
-                <alias field="feature_id" name="" index="3"/>
-                <alias field="featurecat_id" name="" index="4"/>
-                <alias field="dma_id" name="" index="5"/>
-                <alias field="macrodma_id" name="" index="6"/>
-                <alias field="presszonecat_id" name="" index="7"/>
-                <alias field="state" name="" index="8"/>
-                <alias field="builtdate" name="" index="9"/>
-                <alias field="enddate" name="" index="10"/>
-                <alias field="workcat_id" name="" index="11"/>
-                <alias field="workcat_id_end" name="" index="12"/>
-                <alias field="rotation" name="" index="13"/>
-                <alias field="muni_id" name="" index="14"/>
-                <alias field="streetaxis_id" name="" index="15"/>
-                <alias field="postnumber" name="" index="16"/>
-                <alias field="postcode" name="" index="17"/>
-                <alias field="streetaxis2_id" name="" index="18"/>
-                <alias field="postnumber2" name="" index="19"/>
-                <alias field="postcomplement" name="" index="20"/>
-                <alias field="postcomplement2" name="" index="21"/>
-                <alias field="place_name" name="" index="22"/>
-                <alias field="cabinet" name="" index="23"/>
-                <alias field="observations" name="" index="24"/>
-                <alias field="verified" name="" index="25"/>
-                <alias field="expl_id" name="" index="26"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -33997,85 +34343,85 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="sample_id" expression=""/>
-                <default field="code" expression=""/>
-                <default field="lab_code" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="featurecat_id" expression=""/>
-                <default field="dma_id" expression=""/>
-                <default field="macrodma_id" expression=""/>
-                <default field="presszonecat_id" expression=""/>
-                <default field="state" expression=""/>
-                <default field="builtdate" expression=""/>
-                <default field="enddate" expression=""/>
-                <default field="workcat_id" expression=""/>
-                <default field="workcat_id_end" expression=""/>
-                <default field="rotation" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis2_id" expression=""/>
-                <default field="postnumber2" expression=""/>
-                <default field="postcomplement" expression=""/>
-                <default field="postcomplement2" expression=""/>
-                <default field="place_name" expression=""/>
-                <default field="cabinet" expression=""/>
-                <default field="observations" expression=""/>
-                <default field="verified" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="sample_id"/>
+                <default expression="" field="code"/>
+                <default expression="" field="lab_code"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="featurecat_id"/>
+                <default expression="" field="dma_id"/>
+                <default expression="" field="macrodma_id"/>
+                <default expression="" field="presszonecat_id"/>
+                <default expression="" field="state"/>
+                <default expression="" field="builtdate"/>
+                <default expression="" field="enddate"/>
+                <default expression="" field="workcat_id"/>
+                <default expression="" field="workcat_id_end"/>
+                <default expression="" field="rotation"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis2_id"/>
+                <default expression="" field="postnumber2"/>
+                <default expression="" field="postcomplement"/>
+                <default expression="" field="postcomplement2"/>
+                <default expression="" field="place_name"/>
+                <default expression="" field="cabinet"/>
+                <default expression="" field="observations"/>
+                <default expression="" field="verified"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_address20180201103159332">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -34234,74 +34580,74 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="muni_id" name="" index="1"/>
-                <alias field="postcode" name="" index="2"/>
-                <alias field="streetaxis_id" name="" index="3"/>
-                <alias field="postnumber" name="" index="4"/>
-                <alias field="plot_id" name="" index="5"/>
-                <alias field="expl_id" name="" index="6"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="postcode" hidden="0" width="-1" type="field"/>
-                  <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-                  <column name="postnumber" hidden="0" width="-1" type="field"/>
-                  <column name="plot_id" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -34333,73 +34679,73 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="plot_id" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="plot_id"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_plot20180201103159443">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -34558,70 +34904,70 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="plot_code" name="" index="1"/>
-                <alias field="muni_id" name="" index="2"/>
-                <alias field="postcode" name="" index="3"/>
-                <alias field="streetaxis_id" name="" index="4"/>
-                <alias field="postnumber" name="" index="5"/>
-                <alias field="complement" name="" index="6"/>
-                <alias field="placement" name="" index="7"/>
-                <alias field="square" name="" index="8"/>
-                <alias field="observ" name="" index="9"/>
-                <alias field="text" name="" index="10"/>
-                <alias field="expl_id" name="" index="11"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -34653,116 +34999,116 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="plot_code" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="complement" expression=""/>
-                <default field="placement" expression=""/>
-                <default field="square" expression=""/>
-                <default field="observ" expression=""/>
-                <default field="text" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="plot_code"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="complement"/>
+                <default expression="" field="placement"/>
+                <default expression="" field="square"/>
+                <default expression="" field="observ"/>
+                <default expression="" field="text"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression/>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" name="Vista general 1" position="3" frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" blendMode="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" centered="0">
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34770,9 +35116,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -34781,399 +35127,399 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{04100234-7357-49e1-9d15-b7949d417719}" blendMode="0" position="17.1613,22.2695,mm" zValue="16" frameJoinStyle="miter" visibility="1" id="" size="179.415,2.75637,mm" positionOnPage="17.1613,22.2695,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" labelText="[% &quot;observ&quot; %]" halign="1" blendMode="0" position="40.013,223.173,mm" zValue="15" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="149.138,11.1067,mm" positionOnPage="40.013,223.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" labelText="[% &quot;descript&quot; %]" halign="1" blendMode="0" position="37.635,212.191,mm" zValue="14" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="153.454,10.5555,mm" positionOnPage="37.635,212.191,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" halign="1" blendMode="0" position="18.472,191.26,mm" zValue="13" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="77.862,4.52331,mm" positionOnPage="18.472,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" labelText="Observations:" halign="1" blendMode="0" position="18.2394,224.173,mm" zValue="12" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="24.3323,3.60837,mm" positionOnPage="18.2394,224.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" halign="1" blendMode="0" position="18.472,184.169,mm" zValue="11" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,5.87319,mm" positionOnPage="18.472,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" svgBorderWidth="0" frame="false" anchorPoint="0" pictureWidth="5.27855" excludeFromExports="0" svgBorderColor="255,255,255,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" pictureRotation="90" file="arrows/NorthArrow_10.svg" resizeMode="0" blendMode="0" position="186.801,128.951,mm" zValue="10" pictureHeight="6.83615" frameJoinStyle="miter" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" visibility="1" svgFillColor="0,0,0,255" id="compass" size="6.83615,6.83615,mm" northMode="0" positionOnPage="186.801,128.951,mm" itemRotation="0" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="128" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" labelText="Total cost for arc elements:" halign="1" blendMode="0" position="18.472,154.849,mm" zValue="9" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="53.284,5.87319,mm" positionOnPage="18.472,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" labelText="Description:" halign="1" blendMode="0" position="18.4712,213.104,mm" zValue="8" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="20.5677,5.87319,mm" positionOnPage="18.4712,213.104,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" labelText="Priority:  [% &quot;priority&quot; %]" halign="1" blendMode="0" position="18.4712,206.23,mm" zValue="7" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="96.1108,5.87319,mm" positionOnPage="18.4712,206.23,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" blendMode="0" position="17.603,287.775,mm" zValue="6" frameJoinStyle="miter" visibility="1" id="" size="179.614,0.746,mm" positionOnPage="17.603,287.775,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1" frame="false" sectionHeight="6.16796" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" sectionX="0" blendMode="0" position="62.9048,188.347,mm" zValue="5" frameJoinStyle="miter" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,6.16796,mm" positionOnPage="62.9048,188.347,mm" itemRotation="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1" frame="false" sectionHeight="5.9" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" sectionX="0" blendMode="0" position="62.9048,182.447,mm" zValue="4" frameJoinStyle="miter" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,5.9,mm" positionOnPage="62.9048,182.447,mm" itemRotation="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" blendMode="0" position="17.7113,33.9068,mm" zValue="3" frameJoinStyle="miter" visibility="1" id="" size="178.865,0.746323,mm" positionOnPage="17.7113,33.9068,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1" frame="true" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" labelText="" halign="4" blendMode="0" position="85.0548,26.9871,mm" zValue="2" marginX="0" frameJoinStyle="miter" visibility="1" id="title" htmlState="0" valign="32" size="49.4242,4.61973,mm" positionOnPage="85.0548,26.9871,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="false" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" mapFlags="0" blendMode="0" position="18.572,40.2423,mm" zValue="1" frameJoinStyle="miter" visibility="1" followPreset="false" id="map" size="177.676,98.3225,mm" keepLayerSet="false" positionOnPage="18.572,40.2423,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapAtlasMargin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapAtlasMargin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;rotation&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;scale&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4576677.90777442045509815" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymin="4576604.16589934565126896"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -35182,198 +35528,198 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.2" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.5" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" sortAscending="1" featureFilter=" &quot;psector_id&quot; " filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="1" sortFeatures="1" pageNameExpression="" enabled="0" sortKey="psector_id"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>
diff --git a/templates/qgisproject/en/ws_master.qgs b/templates/qgisproject/en/ws_master.qgs
index f97973909..0c952ae07 100644
--- a/templates/qgisproject/en/ws_master.qgs
+++ b/templates/qgisproject/en/ws_master.qgs
@@ -20,310 +20,310 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="O&amp;M" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="O&amp;M">
       <customproperties/>
-      <layer-tree-layer name="Visits" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_om_visit20180201113951439" providerKey="postgres">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_om_visit20180201113951439" name="Visits" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group name="Mincut analysis" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Mincut analysis">
         <customproperties/>
-        <layer-tree-layer name="Mincut init point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" name="Mincut init point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" name="Mincut result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" name="Mincut result connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="INVENTORY" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group name="Map zones" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer name="Exploitation" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dma" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dma20190515092620863" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_sector20171204170540567" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dqa" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Presszone" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Minsector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Network" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-layer name="Node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Link" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_link20160511142132204" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group name="Polygon GROUP" checked="Qt::Checked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer name="Fountain polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Register polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Tank polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Other" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_dimensions20170628134034849" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Element" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_element20170828122555146" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_samplepoint20170619120830016" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="EDIT" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EDIT">
       <customproperties/>
-      <layer-tree-group name="CAD auxiliar layers" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="CAD auxiliar layers">
         <customproperties/>
-        <layer-tree-layer name="Circle" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" expanded="1" id="v_edit_cad_auxcircle20180403155702431" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxcircle&quot; (geom_polygon) sql=" checked="Qt::Checked" id="v_edit_cad_auxcircle20180403155702431" name="Circle" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" expanded="1" id="v_edit_cad_auxpoint20180403155702690" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_cad_auxpoint&quot; (geom_point) sql=" checked="Qt::Checked" id="v_edit_cad_auxpoint20180403155702690" name="Point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="EPA" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="EPA">
       <customproperties/>
-      <layer-tree-group name="Input" checked="Qt::Unchecked" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Input">
         <customproperties/>
-        <layer-tree-group name="Node" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Node">
           <customproperties/>
-          <layer-tree-layer name="Inp reservoir" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_reservoir&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" name="Inp reservoir" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp tank" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" name="Inp tank" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp inlet" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_inlet&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" name="Inp inlet" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp junction" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_junction&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" name="Inp junction" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp mixing" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_mixing20130813215615038" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_mixing&quot; sql=" checked="Qt::Unchecked" id="inp_mixing20130813215615038" name="Inp mixing" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp emitter" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_emitter20130813215614777" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_emitter&quot; sql=" checked="Qt::Unchecked" id="inp_emitter20130813215614777" name="Inp emitter" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp source" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_source20130813215615594" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_source&quot; sql=" checked="Qt::Unchecked" id="inp_source20130813215615594" name="Inp source" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Demand scenario" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_inp_demand20180212154336936" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_demand&quot; sql=" checked="Qt::Unchecked" id="v_edit_inp_demand20180212154336936" name="Demand scenario" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Arc" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Arc">
           <customproperties/>
-          <layer-tree-layer name="Inp virtualvalve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_virtualvalve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" name="Inp virtualvalve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp shortpipe" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_shortpipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" name="Inp shortpipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" name="Inp valve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp pump" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pump&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" name="Inp pump" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Inp pipe" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_pipe&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" name="Inp pipe" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Pump additional" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_pump_additional20171218122636750" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pump_additional&quot; sql=" checked="Qt::Unchecked" id="inp_pump_additional20171218122636750" name="Pump additional" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Connec" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Connec">
           <customproperties/>
-          <layer-tree-layer name="Inp connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" name="Inp connec" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Controls &amp; Rules" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Controls &amp; Rules">
           <customproperties/>
-          <layer-tree-layer name="Controls arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_controls_x_arc20180109103020152" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_controls_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_controls_x_arc20180109103020152" name="Controls arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Rules arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_rules_x_arc20180109103020214" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_arc&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_arc20180109103020214" name="Rules arc" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Rules node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_rules_x_node20180109103020245" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_rules_x_node&quot; sql=" checked="Qt::Unchecked" id="inp_rules_x_node20180109103020245" name="Rules node" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Curves &amp; Patterns" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Curves &amp; Patterns">
           <customproperties/>
-          <layer-tree-layer name="Curve catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve&quot; sql=" checked="Qt::Checked" id="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" name="Curve catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Curve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_curve_value&quot; sql=" checked="Qt::Checked" id="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" name="Curve" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Patterns catalog" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_pattern20130813215615249" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern&quot; sql=" checked="Qt::Unchecked" id="inp_pattern20130813215615249" name="Patterns catalog" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Pattern" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_pattern_value20180109135221371" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_pattern_value&quot; sql=" checked="Qt::Unchecked" id="inp_pattern_value20180109135221371" name="Pattern" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Quality &amp; Energy" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Quality &amp; Energy">
           <customproperties/>
-          <layer-tree-layer name="Energy" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_energy&quot; sql=" checked="Qt::Checked" id="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" name="Energy" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Reactions" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" checked="Qt::Checked" expanded="1" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;inp_reactions&quot; sql=" checked="Qt::Checked" id="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" name="Reactions" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Quality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" checked="Qt::Unchecked" expanded="1" id="inp_quality20130813215615383" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;inp_quality&quot; sql=" checked="Qt::Unchecked" id="inp_quality20130813215615383" name="Quality" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Output" checked="Qt::Unchecked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Output">
         <customproperties/>
-        <layer-tree-group name="Result" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Result">
           <customproperties/>
-          <layer-tree-layer name="Node hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_node_hourly20180309112715024" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_hourly20180309112715024" name="Node hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node minimum values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_node20180206173632034" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node20180206173632034" name="Node minimum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node maximum values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="Node_minimum_values_copy20180206174011431" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="Node_minimum_values_copy20180206174011431" name="Node maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node all values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_node_all20180309112714890" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_node_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_node_all20180309112714890" name="Node all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_arc_hourly20180309112714378" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_hourly20180309112714378" name="Arc hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc maximum values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_arc20180206173632206" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc20180206173632206" name="Arc maximum values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc all values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_arc_all20180309112714512" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_arc_all&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_arc_all20180309112714512" name="Arc all values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Energy usage" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_energy_usage20180201122650430" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_energy_usage20180201122650430" name="Energy usage" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Hydraulic status" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_hydraulic_status20131203141738132" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_hydraulic_status20131203141738132" name="Hydraulic status" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
-        <layer-tree-group name="Compare result" checked="Qt::Unchecked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Compare result">
           <customproperties/>
-          <layer-tree-layer name="Node compare hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_comp_node_hourly20180309112714764" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_hourly20180309112714764" name="Node compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node minimum values compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_node20160710012004695" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node20160710012004695" name="Node minimum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Node maximum values compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_node_copiar20161230144859228" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_node_copiar20161230144859228" name="Node maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc compare hourly values" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_arc_hourly20180309112714639" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc_hourly&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc_hourly20180309112714639" name="Arc compare hourly values" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Arc maximum values compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_rpt_comp_arc20160710012004554" providerKey="postgres">
+          <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_rpt_comp_arc20160710012004554" name="Arc maximum values compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Energy usage compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_comp_energy_usage20160710012004617" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_energy_usage&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_energy_usage20160710012004617" name="Energy usage compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Hydraulic status compare" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" checked="Qt::Unchecked" expanded="1" id="v_rpt_comp_hydraulic_status20160710012004648" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_rpt_comp_hydraulic_status&quot; sql=" checked="Qt::Unchecked" id="v_rpt_comp_hydraulic_status20160710012004648" name="Hydraulic status compare" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="MASTERPLAN" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="MASTERPLAN">
       <customproperties/>
-      <layer-tree-group name="Network value" checked="Qt::Unchecked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Network value">
         <customproperties/>
-        <layer-tree-layer name="Plan result node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_node&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_plan_result_node20180112102743460" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_node&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_plan_result_node20180112102743460" name="Plan result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Plan result arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_plan_result_arc20180112102742726" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_result_arc&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_plan_result_arc20180112102742726" name="Plan result arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Arc x pavement" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;plan_arc_x_pavement&quot; sql=" checked="Qt::Unchecked" expanded="1" id="plan_arc_x_pavement20160710012151609" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;plan_arc_x_pavement&quot; sql=" checked="Qt::Unchecked" id="plan_arc_x_pavement20160710012151609" name="Arc x pavement" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Psectors" checked="Qt::Unchecked" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Psectors">
         <customproperties/>
-        <layer-tree-layer name="Plan psector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_plan_psector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_plan_psector20170627152846650" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_plan_psector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_plan_psector20170627152846650" name="Plan psector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Current psector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_current_psector&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_plan_current_psector&quot; (the_geom) sql=" checked="Qt::Checked" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" name="Current psector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Prices" checked="Qt::Unchecked" expanded="1">
+      <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Prices">
         <customproperties/>
-        <layer-tree-layer name="Prices" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price&quot; sql=" checked="Qt::Checked" expanded="1" id="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price&quot; sql=" checked="Qt::Checked" id="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" name="Prices" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Compost prices" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price_compost&quot; sql=" checked="Qt::Checked" expanded="1" id="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table=&quot;SCHEMA_NAME&quot;.&quot;plan_price_compost&quot; sql=" checked="Qt::Checked" id="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" name="Compost prices" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="BASEMAP" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group name="Address" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ext_municipality20171204170633784" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_ext_address20180201103159332" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Streetaxis" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_plot20180201103159443" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -386,62 +386,62 @@
       <item>v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" unit="1" enabled="1" type="1" tolerance="15" mode="3">
+  <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting units="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_comp_arc_hourly20180309112714639" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_plot20180201103159443" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_cad_auxpoint20180403155702690" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_node_all20180309112714890" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="v_edit_dimensions20170628134034849" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_edit_dma20190515092620863" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_samplepoint20170619120830016" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_comp_node_copiar20161230144859228" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_sector20171204170540567" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_address20180201103159332" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_rpt_comp_node_hourly20180309112714764" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_rpt_arc_all20180309112714512" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_om_visit20180201113951439" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_link20160511142132204" enabled="1" type="2" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="Node_minimum_values_copy20180206174011431" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_cad_auxcircle20180403155702431" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_node_hourly20180309112715024" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_rpt_arc_hourly20180309112714378" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_element20170828122555146" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_plan_result_node20180112102743460" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_arc20180206173632206" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="ext_municipality20171204170633784" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_rpt_comp_arc20160710012004554" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_plan_psector20170627152846650" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_plan_result_arc20180112102742726" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_node20180206173632034" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_rpt_comp_node20160710012004695" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" enabled="0" type="1" tolerance="12"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node20180206173632034" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_om_visit20180201113951439" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_plan_result_arc20180112102742726" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_hourly20180309112714764" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc20180206173632206" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_all20180309112714512" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc20160710012004554" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxpoint20180403155702690" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_hourly20180309112715024" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_arc_hourly20180309112714378" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_cad_auxcircle20180403155702431" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="Node_minimum_values_copy20180206174011431" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node20160710012004695" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_arc_hourly20180309112714639" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_plan_result_node20180112102743460" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_node_all20180309112714890" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_plan_psector20170627152846650" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_rpt_comp_node_copiar20161230144859228" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -472,433 +472,433 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" name="O&amp;M" checked="Qt::Checked">
-      <legendlayer open="true" showFeatureCount="0" name="Visits" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="O&amp;M" open="false">
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Visits" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" layerid="v_edit_om_visit20180201113951439" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="false" name="Mincut analysis" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Mincut init point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Mincut analysis" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut init point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result node" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result connec" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="true" name="INVENTORY" checked="Qt::Checked">
-      <legendgroup open="false" name="Map zones" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Exploitation" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dma" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Sector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dqa" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Presszone" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Minsector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Network" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Arc" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Link" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" name="Polygon GROUP" checked="Qt::Checked">
-          <legendlayer open="true" showFeatureCount="0" name="Fountain polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Register polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Tank polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Other" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Dimensioning" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Element" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Sample point" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="EDIT" checked="Qt::Unchecked">
-      <legendgroup open="false" name="CAD auxiliar layers" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Circle" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="EDIT" open="false">
+      <legendgroup checked="Qt::Checked" name="CAD auxiliar layers" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Circle" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_cad_auxcircle20180403155702431" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_cad_auxpoint20180403155702690" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="EPA" checked="Qt::Unchecked">
-      <legendgroup open="true" name="Input" checked="Qt::Unchecked">
-        <legendgroup open="false" name="Node" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Inp reservoir" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="EPA" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Input" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Node" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp reservoir" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp tank" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp tank" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp inlet" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp inlet" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp junction" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp junction" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp mixing" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp mixing" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_mixing20130813215615038" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp emitter" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp emitter" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_emitter20130813215614777" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp source" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Inp source" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_source20130813215615594" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Demand scenario" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Demand scenario" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_demand20180212154336936" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Arc" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Inp virtualvalve" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Arc" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp virtualvalve" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp shortpipe" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp shortpipe" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp valve" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp valve" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp pump" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pump" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Inp pipe" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp pipe" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Pump additional" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pump additional" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_pump_additional20171218122636750" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Connec" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Inp connec" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Connec" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Inp connec" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Controls &amp; Rules" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Controls arc" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Controls &amp; Rules" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Controls arc" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_controls_x_arc20180109103020152" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Rules arc" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules arc" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_rules_x_arc20180109103020214" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Rules node" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Rules node" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_rules_x_node20180109103020245" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Curves &amp; Patterns" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Curve catalog" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Curves &amp; Patterns" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve catalog" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_curve_383cb6c0_4452_42b4_a17d_131cca921196" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Curve" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Curve" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Patterns catalog" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Patterns catalog" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_pattern20130813215615249" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Pattern" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Pattern" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_pattern_value20180109135221371" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Quality &amp; Energy" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Energy" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Quality &amp; Energy" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Energy" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Reactions" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Reactions" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_reactions_f73d50b8_9677_4153_a539_44288088218b" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Quality" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Quality" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="inp_quality20130813215615383" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Output" checked="Qt::Unchecked">
-        <legendgroup open="false" name="Result" checked="Qt::Unchecked">
-          <legendlayer open="false" showFeatureCount="0" name="Node hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Unchecked" name="Output" open="false">
+        <legendgroup checked="Qt::Unchecked" name="Result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node hourly values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_node_hourly20180309112715024" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node minimum values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_node20180206173632034" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node maximum values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="Node_minimum_values_copy20180206174011431" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node all values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node all values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_node_all20180309112714890" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc hourly values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_arc_hourly20180309112714378" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc maximum values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_arc20180206173632206" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Arc all values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc all values" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_arc_all20180309112714512" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Energy usage" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_energy_usage20180201122650430" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Hydraulic status" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_hydraulic_status20131203141738132" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
-        <legendgroup open="false" name="Compare result" checked="Qt::Unchecked">
-          <legendlayer open="true" showFeatureCount="0" name="Node compare hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Unchecked" name="Compare result" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node compare hourly values" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_comp_node_hourly20180309112714764" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node minimum values compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node minimum values compare" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_node20160710012004695" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Node maximum values compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Node maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_node_copiar20161230144859228" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc compare hourly values" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc compare hourly values" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_arc_hourly20180309112714639" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="false" showFeatureCount="0" name="Arc maximum values compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="false" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc maximum values compare" open="false">
+            <filegroup hidden="false" open="false">
               <legendlayerfile visible="0" layerid="v_rpt_comp_arc20160710012004554" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Energy usage compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Energy usage compare" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_comp_energy_usage20160710012004617" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Hydraulic status compare" checked="Qt::Unchecked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Hydraulic status compare" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="0" layerid="v_rpt_comp_hydraulic_status20160710012004648" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="MASTERPLAN" checked="Qt::Unchecked">
-      <legendgroup open="false" name="Network value" checked="Qt::Unchecked">
-        <legendlayer open="true" showFeatureCount="0" name="Plan result node" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="MASTERPLAN" open="false">
+      <legendgroup checked="Qt::Unchecked" name="Network value" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan result node" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_plan_result_node20180112102743460" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Plan result arc" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan result arc" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_plan_result_arc20180112102742726" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Arc x pavement" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Arc x pavement" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="plan_arc_x_pavement20160710012151609" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Psectors" checked="Qt::Unchecked">
-        <legendlayer open="true" showFeatureCount="0" name="Plan psector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+      <legendgroup checked="Qt::Unchecked" name="Psectors" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Plan psector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_plan_psector20170627152846650" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Current psector" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Current psector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Prices" checked="Qt::Unchecked">
-        <legendlayer open="true" showFeatureCount="0" name="Prices" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+      <legendgroup checked="Qt::Unchecked" name="Prices" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Prices" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Compost prices" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Compost prices" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="BASEMAP" checked="Qt::Checked">
-      <legendgroup open="true" name="Address" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Municipality" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Address" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Streetaxis" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Plot" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
@@ -908,7 +908,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>Node_minimum_values_copy20180206174011431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -968,202 +968,202 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -1171,49 +1171,49 @@
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -1226,27 +1226,27 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1255,8 +1255,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1265,8 +1265,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1275,8 +1275,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1285,8 +1285,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1295,8 +1295,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1305,8 +1305,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1322,8 +1322,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1339,8 +1339,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1356,8 +1356,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1388,64 +1388,64 @@
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ba6251be-5ace-4d55-b25d-6fb849fca375}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1482,7 +1482,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -1541,7 +1541,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -1565,26 +1565,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1602,56 +1602,68 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -1665,34 +1677,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="muni_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="183" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1724,10 +1736,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="observ"/>
+        <field name="active" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="observ" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="active"/>
@@ -1739,7 +1751,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_controls_x_arc20180109103020152</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_controls_x_arc" sql=</datasource>
       <keywordList>
@@ -1800,7 +1812,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1843,31 +1855,31 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1883,19 +1895,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="text"/>
+        <field name="active" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_383cb6c0_4452_42b4_a17d_131cca921196</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -1954,7 +1966,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -1999,28 +2011,28 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="curve_type" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="isdoublen2a" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="isdoublen2a" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_type" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="isdoublen2a" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="isdoublen2a" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="curve_type" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="isdoublen2a" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="isdoublen2a" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2041,9 +2053,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_curve_value_8a0adea1_3647_4f99_a329_f9b5bea4832b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve_value" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_curve_value" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -2102,7 +2114,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -2147,28 +2159,28 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="x_value" applyOnUpdate="0" expression=""/>
-        <default field="y_value" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="x_value" expression=""/>
+        <default applyOnUpdate="0" field="y_value" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_value" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_value" notnull_strength="1" constraints="1" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="curve_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="x_value" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="y_value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="x_value" desc="" exp=""/>
-        <constraint field="y_value" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="x_value" desc=""/>
+        <constraint exp="" field="y_value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2189,7 +2201,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_emitter20130813215614777</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_emitter" sql=</datasource>
       <keywordList>
@@ -2250,7 +2262,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2266,8 +2278,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2280,30 +2292,30 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="coef" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="coef" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="coef" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="coef" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="coef" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" notificationMessage="" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_emitter20130813215614777',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ccb9280d-0be5-407e-a747-db17ca76f4f7}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="coef" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="coef"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2319,15 +2331,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="coef"/>
-        <field editable="1" name="node_id"/>
+        <field name="coef" editable="1"/>
+        <field name="node_id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_energy_73c21ea3_dc7a_427d_aa5e_02842b44c7c7</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_energy" sql=</datasource>
       <keywordList>
@@ -2388,7 +2400,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -2417,26 +2429,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2452,15 +2464,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="id"/>
+        <field name="descript" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_mixing20130813215615038</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_mixing" sql=</datasource>
       <keywordList>
@@ -2487,6 +2499,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -2503,7 +2524,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -2525,7 +2554,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2534,30 +2563,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="mix_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="2COMP" type="QString" value="2COMP"/>
-                  <Option name="FIFO" type="QString" value="FIFO"/>
-                  <Option name="LIFO" type="QString" value="LIFO"/>
-                  <Option name="MIXED" type="QString" value="MIXED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="value">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -2570,34 +2598,35 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="mix_type" applyOnUpdate="0" expression=""/>
-        <default field="value" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="mix_type" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="mix_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="value" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mix_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="mix_type" desc="" exp=""/>
-        <constraint field="value" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="mix_type" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" notificationMessage="" id="{090a6f21-21c8-42f5-9ee2-ac605342a7fa}" type="1" capture="0">
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_mixing20130813215615038',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{48abc25e-d3b4-487c-84ec-7ac39610627f}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="mix_type" hidden="0" width="-1" type="field"/>
-          <column name="value" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="mix_type"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2629,16 +2658,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="mix_type"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="value"/>
+        <field name="mix_type" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="value" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="mix_type"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="value"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern20130813215615249</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pattern_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern" sql=</datasource>
       <keywordList>
@@ -2691,7 +2724,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -2720,7 +2753,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2729,8 +2762,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2766,40 +2799,40 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="tscode" applyOnUpdate="0" expression=""/>
-        <default field="tsparameters" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="tscode" expression=""/>
+        <default applyOnUpdate="0" field="tsparameters" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pattern_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tscode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tsparameters" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tscode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tsparameters" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="tscode" desc="" exp=""/>
-        <constraint field="tsparameters" desc="" exp=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="tscode" desc=""/>
+        <constraint exp="" field="tsparameters" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" notificationMessage="" id="{5e331a69-33a3-4cac-9657-c86880183ed4}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_pattern20130813215615249',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5e331a69-33a3-4cac-9657-c86880183ed4}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="pattern_type" hidden="0" width="-1" type="field"/>
-          <column name="tscode" hidden="0" width="-1" type="field"/>
-          <column name="tsparameters" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="pattern_type"/>
+          <column type="field" width="-1" hidden="0" name="tscode"/>
+          <column type="field" width="-1" hidden="0" name="tsparameters"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2831,11 +2864,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="pattern_type"/>
-        <field editable="1" name="tscode"/>
-        <field editable="1" name="tsparameters"/>
+        <field name="observ" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="pattern_type" editable="1"/>
+        <field name="tscode" editable="1"/>
+        <field name="tsparameters" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="observ"/>
@@ -2848,7 +2881,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("pattern_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pattern_value20180109135221371</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pattern_value" sql=</datasource>
       <keywordList>
@@ -2875,6 +2908,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -2891,7 +2933,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -2913,161 +2963,188 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
         <field name="id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_3">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_4">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_5">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_6">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_7">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_8">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_9">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_10">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_11">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_12">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="factor_13">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_14">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_15">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_16">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_17">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="factor_18">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -3099,104 +3176,98 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="factor_1" applyOnUpdate="0" expression=""/>
-        <default field="factor_2" applyOnUpdate="0" expression=""/>
-        <default field="factor_3" applyOnUpdate="0" expression=""/>
-        <default field="factor_4" applyOnUpdate="0" expression=""/>
-        <default field="factor_5" applyOnUpdate="0" expression=""/>
-        <default field="factor_6" applyOnUpdate="0" expression=""/>
-        <default field="factor_7" applyOnUpdate="0" expression=""/>
-        <default field="factor_8" applyOnUpdate="0" expression=""/>
-        <default field="factor_9" applyOnUpdate="0" expression=""/>
-        <default field="factor_10" applyOnUpdate="0" expression=""/>
-        <default field="factor_11" applyOnUpdate="0" expression=""/>
-        <default field="factor_12" applyOnUpdate="0" expression=""/>
-        <default field="factor_13" applyOnUpdate="0" expression=""/>
-        <default field="factor_14" applyOnUpdate="0" expression=""/>
-        <default field="factor_15" applyOnUpdate="0" expression=""/>
-        <default field="factor_16" applyOnUpdate="0" expression=""/>
-        <default field="factor_17" applyOnUpdate="0" expression=""/>
-        <default field="factor_18" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="factor_1" expression=""/>
+        <default applyOnUpdate="0" field="factor_2" expression=""/>
+        <default applyOnUpdate="0" field="factor_3" expression=""/>
+        <default applyOnUpdate="0" field="factor_4" expression=""/>
+        <default applyOnUpdate="0" field="factor_5" expression=""/>
+        <default applyOnUpdate="0" field="factor_6" expression=""/>
+        <default applyOnUpdate="0" field="factor_7" expression=""/>
+        <default applyOnUpdate="0" field="factor_8" expression=""/>
+        <default applyOnUpdate="0" field="factor_9" expression=""/>
+        <default applyOnUpdate="0" field="factor_10" expression=""/>
+        <default applyOnUpdate="0" field="factor_11" expression=""/>
+        <default applyOnUpdate="0" field="factor_12" expression=""/>
+        <default applyOnUpdate="0" field="factor_13" expression=""/>
+        <default applyOnUpdate="0" field="factor_14" expression=""/>
+        <default applyOnUpdate="0" field="factor_15" expression=""/>
+        <default applyOnUpdate="0" field="factor_16" expression=""/>
+        <default applyOnUpdate="0" field="factor_17" expression=""/>
+        <default applyOnUpdate="0" field="factor_18" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_3" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_4" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_5" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_6" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_7" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_8" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_9" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_10" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_11" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_12" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_13" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_14" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_15" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_16" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_17" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="factor_18" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_3" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_4" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_5" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_6" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_7" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_8" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_9" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_10" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_11" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_12" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_13" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_14" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_15" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_16" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_17" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="factor_18" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="factor_1" desc="" exp=""/>
-        <constraint field="factor_2" desc="" exp=""/>
-        <constraint field="factor_3" desc="" exp=""/>
-        <constraint field="factor_4" desc="" exp=""/>
-        <constraint field="factor_5" desc="" exp=""/>
-        <constraint field="factor_6" desc="" exp=""/>
-        <constraint field="factor_7" desc="" exp=""/>
-        <constraint field="factor_8" desc="" exp=""/>
-        <constraint field="factor_9" desc="" exp=""/>
-        <constraint field="factor_10" desc="" exp=""/>
-        <constraint field="factor_11" desc="" exp=""/>
-        <constraint field="factor_12" desc="" exp=""/>
-        <constraint field="factor_13" desc="" exp=""/>
-        <constraint field="factor_14" desc="" exp=""/>
-        <constraint field="factor_15" desc="" exp=""/>
-        <constraint field="factor_16" desc="" exp=""/>
-        <constraint field="factor_17" desc="" exp=""/>
-        <constraint field="factor_18" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="factor_1" desc=""/>
+        <constraint exp="" field="factor_2" desc=""/>
+        <constraint exp="" field="factor_3" desc=""/>
+        <constraint exp="" field="factor_4" desc=""/>
+        <constraint exp="" field="factor_5" desc=""/>
+        <constraint exp="" field="factor_6" desc=""/>
+        <constraint exp="" field="factor_7" desc=""/>
+        <constraint exp="" field="factor_8" desc=""/>
+        <constraint exp="" field="factor_9" desc=""/>
+        <constraint exp="" field="factor_10" desc=""/>
+        <constraint exp="" field="factor_11" desc=""/>
+        <constraint exp="" field="factor_12" desc=""/>
+        <constraint exp="" field="factor_13" desc=""/>
+        <constraint exp="" field="factor_14" desc=""/>
+        <constraint exp="" field="factor_15" desc=""/>
+        <constraint exp="" field="factor_16" desc=""/>
+        <constraint exp="" field="factor_17" desc=""/>
+        <constraint exp="" field="factor_18" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="factor_1" hidden="0" width="-1" type="field"/>
-          <column name="factor_2" hidden="0" width="-1" type="field"/>
-          <column name="factor_3" hidden="0" width="-1" type="field"/>
-          <column name="factor_4" hidden="0" width="-1" type="field"/>
-          <column name="factor_5" hidden="0" width="-1" type="field"/>
-          <column name="factor_6" hidden="0" width="-1" type="field"/>
-          <column name="factor_7" hidden="0" width="-1" type="field"/>
-          <column name="factor_8" hidden="0" width="-1" type="field"/>
-          <column name="factor_9" hidden="0" width="-1" type="field"/>
-          <column name="factor_10" hidden="0" width="-1" type="field"/>
-          <column name="factor_11" hidden="0" width="-1" type="field"/>
-          <column name="factor_12" hidden="0" width="-1" type="field"/>
-          <column name="factor_13" hidden="0" width="-1" type="field"/>
-          <column name="factor_14" hidden="0" width="-1" type="field"/>
-          <column name="factor_15" hidden="0" width="-1" type="field"/>
-          <column name="factor_16" hidden="0" width="-1" type="field"/>
-          <column name="factor_17" hidden="0" width="-1" type="field"/>
-          <column name="factor_18" hidden="0" width="-1" type="field"/>
-          <column name="factor_19" hidden="0" width="-1" type="field"/>
-          <column name="factor_20" hidden="0" width="-1" type="field"/>
-          <column name="factor_21" hidden="0" width="-1" type="field"/>
-          <column name="factor_22" hidden="0" width="-1" type="field"/>
-          <column name="factor_23" hidden="0" width="-1" type="field"/>
-          <column name="factor_24" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="factor_1"/>
+          <column type="field" width="-1" hidden="0" name="factor_2"/>
+          <column type="field" width="-1" hidden="0" name="factor_3"/>
+          <column type="field" width="-1" hidden="0" name="factor_4"/>
+          <column type="field" width="-1" hidden="0" name="factor_5"/>
+          <column type="field" width="-1" hidden="0" name="factor_6"/>
+          <column type="field" width="-1" hidden="0" name="factor_7"/>
+          <column type="field" width="-1" hidden="0" name="factor_8"/>
+          <column type="field" width="-1" hidden="0" name="factor_9"/>
+          <column type="field" width="-1" hidden="0" name="factor_10"/>
+          <column type="field" width="-1" hidden="0" name="factor_11"/>
+          <column type="field" width="-1" hidden="0" name="factor_12"/>
+          <column type="field" width="-1" hidden="0" name="factor_13"/>
+          <column type="field" width="-1" hidden="0" name="factor_14"/>
+          <column type="field" width="-1" hidden="0" name="factor_15"/>
+          <column type="field" width="-1" hidden="0" name="factor_16"/>
+          <column type="field" width="-1" hidden="0" name="factor_17"/>
+          <column type="field" width="-1" hidden="0" name="factor_18"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3228,33 +3299,54 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="factor_1"/>
-        <field editable="1" name="factor_10"/>
-        <field editable="1" name="factor_11"/>
-        <field editable="1" name="factor_12"/>
-        <field editable="1" name="factor_13"/>
-        <field editable="1" name="factor_14"/>
-        <field editable="1" name="factor_15"/>
-        <field editable="1" name="factor_16"/>
-        <field editable="1" name="factor_17"/>
-        <field editable="1" name="factor_18"/>
-        <field editable="1" name="factor_2"/>
-        <field editable="1" name="factor_3"/>
-        <field editable="1" name="factor_4"/>
-        <field editable="1" name="factor_5"/>
-        <field editable="1" name="factor_6"/>
-        <field editable="1" name="factor_7"/>
-        <field editable="1" name="factor_8"/>
-        <field editable="1" name="factor_9"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="pattern_id"/>
+        <field name="factor_1" editable="1"/>
+        <field name="factor_10" editable="1"/>
+        <field name="factor_11" editable="1"/>
+        <field name="factor_12" editable="1"/>
+        <field name="factor_13" editable="1"/>
+        <field name="factor_14" editable="1"/>
+        <field name="factor_15" editable="1"/>
+        <field name="factor_16" editable="1"/>
+        <field name="factor_17" editable="1"/>
+        <field name="factor_18" editable="1"/>
+        <field name="factor_2" editable="1"/>
+        <field name="factor_3" editable="1"/>
+        <field name="factor_4" editable="1"/>
+        <field name="factor_5" editable="1"/>
+        <field name="factor_6" editable="1"/>
+        <field name="factor_7" editable="1"/>
+        <field name="factor_8" editable="1"/>
+        <field name="factor_9" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="factor_1"/>
+        <field labelOnTop="0" name="factor_10"/>
+        <field labelOnTop="0" name="factor_11"/>
+        <field labelOnTop="0" name="factor_12"/>
+        <field labelOnTop="0" name="factor_13"/>
+        <field labelOnTop="0" name="factor_14"/>
+        <field labelOnTop="0" name="factor_15"/>
+        <field labelOnTop="0" name="factor_16"/>
+        <field labelOnTop="0" name="factor_17"/>
+        <field labelOnTop="0" name="factor_18"/>
+        <field labelOnTop="0" name="factor_2"/>
+        <field labelOnTop="0" name="factor_3"/>
+        <field labelOnTop="0" name="factor_4"/>
+        <field labelOnTop="0" name="factor_5"/>
+        <field labelOnTop="0" name="factor_6"/>
+        <field labelOnTop="0" name="factor_7"/>
+        <field labelOnTop="0" name="factor_8"/>
+        <field labelOnTop="0" name="factor_9"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_pump_additional20171218122636750</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_pump_additional" sql=</datasource>
       <keywordList>
@@ -3281,6 +3373,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -3297,7 +3398,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -3319,7 +3428,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3328,8 +3437,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3338,8 +3447,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3348,8 +3457,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3358,21 +3467,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="curve_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="PUMP_01" type="QString" value="PUMP_01"/>
-                  <Option name="PUMP_02" type="QString" value="PUMP_02"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3381,56 +3487,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CLOSED" type="QString" value="CLOSED"/>
-                  <Option name="OPEN" type="QString" value="OPEN"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="energyparam">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="EFFIC" type="QString" value="EFFIC"/>
-                  <Option name="PATTERN" type="QString" value="PATTERN"/>
-                  <Option name="PRICE" type="QString" value="PRICE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3439,8 +3527,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -3461,54 +3549,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="order_id" applyOnUpdate="0" expression=""/>
-        <default field="power" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="speed" applyOnUpdate="0" expression=""/>
-        <default field="pattern" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="energyparam" applyOnUpdate="0" expression=""/>
-        <default field="energyvalue" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="order_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="energyparam" expression=""/>
+        <default applyOnUpdate="0" field="energyvalue" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="order_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="power" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="speed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="energyparam" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="energyvalue" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="order_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyparam" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="energyvalue" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="order_id" desc="" exp=""/>
-        <constraint field="power" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="speed" desc="" exp=""/>
-        <constraint field="pattern" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="energyparam" desc="" exp=""/>
-        <constraint field="energyvalue" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="order_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="energyparam" desc=""/>
+        <constraint exp="" field="energyvalue" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="order_id" hidden="0" width="-1" type="field"/>
-          <column name="power" hidden="0" width="-1" type="field"/>
-          <column name="curve_id" hidden="0" width="-1" type="field"/>
-          <column name="speed" hidden="0" width="-1" type="field"/>
-          <column name="pattern" hidden="0" width="-1" type="field"/>
-          <column name="status" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="order_id"/>
+          <column type="field" width="-1" hidden="0" name="power"/>
+          <column type="field" width="-1" hidden="0" name="curve_id"/>
+          <column type="field" width="-1" hidden="0" name="speed"/>
+          <column type="field" width="-1" hidden="0" name="pattern"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="energyparam"/>
+          <column type="field" width="-1" hidden="0" name="energyvalue"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3540,23 +3632,34 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="curve_id"/>
-        <field editable="1" name="energyparam"/>
-        <field editable="1" name="energyvalue"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="order_id"/>
-        <field editable="1" name="pattern"/>
-        <field editable="1" name="power"/>
-        <field editable="1" name="speed"/>
-        <field editable="1" name="status"/>
+        <field name="curve_id" editable="1"/>
+        <field name="energyparam" editable="1"/>
+        <field name="energyvalue" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="order_id" editable="1"/>
+        <field name="pattern" editable="1"/>
+        <field name="power" editable="1"/>
+        <field name="speed" editable="1"/>
+        <field name="status" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="curve_id"/>
+        <field labelOnTop="0" name="energyparam"/>
+        <field labelOnTop="0" name="energyvalue"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="order_id"/>
+        <field labelOnTop="0" name="pattern"/>
+        <field labelOnTop="0" name="power"/>
+        <field labelOnTop="0" name="speed"/>
+        <field labelOnTop="0" name="status"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_quality20130813215615383</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_quality" sql=</datasource>
       <keywordList>
@@ -3621,7 +3724,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3637,8 +3740,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3651,30 +3754,30 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="initqual" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="initqual" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="initqual" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initqual" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="initqual" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="initqual" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" notificationMessage="" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_quality20130813215615383',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{ade6801e-6712-4b0f-92a2-87ead965d6a9}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="initqual" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="initqual"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3706,15 +3809,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="initqual"/>
-        <field editable="1" name="node_id"/>
+        <field name="initqual" editable="1"/>
+        <field name="node_id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_reactions_f73d50b8_9677_4153_a539_44288088218b</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."inp_reactions" sql=</datasource>
       <keywordList>
@@ -3775,7 +3878,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -3804,26 +3907,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3839,15 +3942,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="id"/>
+        <field name="descript" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_arc20180109103020214</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_arc" sql=</datasource>
       <keywordList>
@@ -3908,7 +4011,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3917,8 +4020,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3927,8 +4030,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3937,7 +4040,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="true"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -3959,31 +4062,31 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3999,17 +4102,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="text"/>
+        <field name="active" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_rules_x_node20180109103020245</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_rules_x_node" sql=</datasource>
       <keywordList>
@@ -4074,7 +4177,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4083,8 +4186,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4093,8 +4196,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4103,7 +4206,7 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="true"/>
+                <Option type="bool" name="IsMultiline" value="true"/>
               </Option>
             </config>
           </editWidget>
@@ -4125,31 +4228,31 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="140" type="field"/>
-          <column name="text" hidden="0" width="257" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="140" hidden="0" name="node_id"/>
+          <column type="field" width="257" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4181,17 +4284,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="text"/>
+        <field name="active" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="-4.65661e-10" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="-4.65661e-10" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>inp_source20130813215615594</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."inp_source" sql=</datasource>
       <keywordList>
@@ -4218,6 +4321,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -4234,7 +4346,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -4252,10 +4372,11 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="variableNames" value="_fields_"/>
-        <property key="variableValues" value=""/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4264,22 +4385,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sourc_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CONCEN" type="QString" value="CONCEN"/>
-                  <Option name="FLOWPACED" type="QString" value="FLOWPACED"/>
-                  <Option name="MASS" type="QString" value="MASS"/>
-                  <Option name="SETPOINT" type="QString" value="SETPOINT"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4288,31 +4405,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4327,38 +4431,39 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="sourc_type" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="sourc_type" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="sourc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sourc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="sourc_type" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="sourc_type" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" notificationMessage="" id="{5bf224c0-cbdb-424f-bf89-7261c1778097}" type="1" capture="0">
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('inp_source20130813215615594',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{e54b4ee0-6770-4558-9c37-87e9e290f252}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="sourc_type" hidden="0" width="-1" type="field"/>
-          <column name="quality" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="sourc_type"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4390,17 +4495,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="quality"/>
-        <field editable="1" name="sourc_type"/>
+        <field name="node_id" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="quality" editable="1"/>
+        <field name="sourc_type" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+        <field labelOnTop="0" name="quality"/>
+        <field labelOnTop="0" name="sourc_type"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("node_id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_arc_x_pavement20160710012151609</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."plan_arc_x_pavement" sql=</datasource>
       <shortname>plan_arc_x_pavement</shortname>
@@ -4428,6 +4538,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -4444,7 +4563,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -4461,8 +4588,12 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4471,8 +4602,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4481,21 +4612,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pavcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Asphalt" type="QString" value="Asphalt"/>
-                  <Option name="pavement1" type="QString" value="pavement1"/>
-                  <Option name="pavement2" type="QString" value="pavement2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4504,8 +4632,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4520,34 +4648,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="pavcat_id" applyOnUpdate="0" expression=""/>
-        <default field="percent" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="pavcat_id" expression=""/>
+        <default applyOnUpdate="0" field="percent" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="pavcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="percent" notnull_strength="1" constraints="1" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pavcat_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="percent" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="pavcat_id" desc="" exp=""/>
-        <constraint field="percent" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="pavcat_id" desc=""/>
+        <constraint exp="" field="percent" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="pavcat_id" hidden="0" width="-1" type="field"/>
-          <column name="percent" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="pavcat_id"/>
+          <column type="field" width="-1" hidden="0" name="percent"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4559,23 +4687,44 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="pavcat_id"/>
-        <field editable="1" name="percent"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="pavcat_id" editable="1"/>
+        <field name="percent" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="arc_id"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pavcat_id"/>
+        <field labelOnTop="0" name="percent"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price_compost" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price_compost" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -4636,7 +4785,7 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -4681,34 +4830,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="compost_id" applyOnUpdate="0" expression=""/>
-        <default field="simple_id" applyOnUpdate="0" expression=""/>
-        <default field="value" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="compost_id" expression=""/>
+        <default applyOnUpdate="0" field="simple_id" expression=""/>
+        <default applyOnUpdate="0" field="value" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="compost_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="simple_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="value" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="compost_id" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="simple_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="value" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="compost_id" desc="" exp=""/>
-        <constraint field="simple_id" desc="" exp=""/>
-        <constraint field="value" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="compost_id" desc=""/>
+        <constraint exp="" field="simple_id" desc=""/>
+        <constraint exp="" field="value" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="compost_id" hidden="0" width="-1" type="field"/>
-          <column name="simple_id" hidden="0" width="-1" type="field"/>
-          <column name="value" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="compost_id"/>
+          <column type="field" width="-1" hidden="0" name="simple_id"/>
+          <column type="field" width="-1" hidden="0" name="value"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4729,9 +4878,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price" sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price" sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -4792,7 +4941,7 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property key="dualview/previewExpressions" value="&quot;descript&quot;"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -4853,42 +5002,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="unit" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="price" applyOnUpdate="0" expression=""/>
-        <default field="pricecat_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="unit" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="price" expression=""/>
+        <default applyOnUpdate="0" field="pricecat_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="unit" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="price" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pricecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="unit" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="price" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pricecat_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="unit" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="price" desc="" exp=""/>
-        <constraint field="pricecat_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="unit" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="price" desc=""/>
+        <constraint exp="" field="pricecat_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="unit" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="price" hidden="0" width="-1" type="field"/>
-          <column name="pricecat_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="unit"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="price"/>
+          <column type="field" width="-1" hidden="0" name="pricecat_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4909,7 +5058,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"descript"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -4968,7 +5117,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -4992,118 +5141,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule label="Obsolete" key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" symbol="0"/>
-          <rule label="On service" key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" symbol="1"/>
-          <rule label="Planified" key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" symbol="2"/>
-          <rule label="Varc" key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " symbol="3"/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5112,79 +5261,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="arccat_id">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placementFlags="10" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="0" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -5198,21 +5347,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5343,6 +5492,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -5413,6 +5569,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -5427,6 +5590,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="dqa_id">
           <editWidget type="Range">
             <config>
@@ -5434,6 +5604,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -5721,6 +5898,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="depth">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="arc_id" name="" index="0"/>
@@ -5741,364 +5953,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="15"/>
         <alias field="macroexpl_id" name="" index="16"/>
         <alias field="sector_id" name="" index="17"/>
-        <alias field="macrosector_id" name="" index="18"/>
-        <alias field="state" name="" index="19"/>
-        <alias field="state_type" name="" index="20"/>
-        <alias field="annotation" name="" index="21"/>
-        <alias field="observ" name="" index="22"/>
-        <alias field="comment" name="" index="23"/>
-        <alias field="gis_length" name="" index="24"/>
-        <alias field="custom_length" name="" index="25"/>
-        <alias field="minsector_id" name="" index="26"/>
-        <alias field="dma_id" name="" index="27"/>
-        <alias field="macrodma_id" name="" index="28"/>
-        <alias field="presszone_id" name="" index="29"/>
-        <alias field="dqa_id" name="" index="30"/>
-        <alias field="macrodqa_id" name="" index="31"/>
-        <alias field="soilcat_id" name="" index="32"/>
-        <alias field="function_type" name="" index="33"/>
-        <alias field="category_type" name="" index="34"/>
-        <alias field="fluid_type" name="" index="35"/>
-        <alias field="location_type" name="" index="36"/>
-        <alias field="workcat_id" name="" index="37"/>
-        <alias field="workcat_id_end" name="" index="38"/>
-        <alias field="buildercat_id" name="" index="39"/>
-        <alias field="builtdate" name="" index="40"/>
-        <alias field="enddate" name="" index="41"/>
-        <alias field="ownercat_id" name="" index="42"/>
-        <alias field="muni_id" name="" index="43"/>
-        <alias field="postcode" name="" index="44"/>
-        <alias field="district_id" name="" index="45"/>
-        <alias field="streetname" name="" index="46"/>
-        <alias field="postnumber" name="" index="47"/>
-        <alias field="postcomplement" name="" index="48"/>
-        <alias field="streetname2" name="" index="49"/>
-        <alias field="postnumber2" name="" index="50"/>
-        <alias field="postcomplement2" name="" index="51"/>
-        <alias field="descript" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="cat_arctype_id" name="" index="63"/>
-        <alias field="nodetype_1" name="" index="64"/>
-        <alias field="staticpress1" name="" index="65"/>
-        <alias field="nodetype_2" name="" index="66"/>
-        <alias field="staticpress2" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation1" applyOnUpdate="0" expression=""/>
-        <default field="depth1" applyOnUpdate="0" expression=""/>
-        <default field="elevation2" applyOnUpdate="0" expression=""/>
-        <default field="depth2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="cat_arctype_id" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_1" applyOnUpdate="0" expression=""/>
-        <default field="staticpress1" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_2" applyOnUpdate="0" expression=""/>
-        <default field="staticpress2" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_arctype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation1" desc="" exp=""/>
-        <constraint field="depth1" desc="" exp=""/>
-        <constraint field="elevation2" desc="" exp=""/>
-        <constraint field="depth2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="cat_arctype_id" desc="" exp=""/>
-        <constraint field="nodetype_1" desc="" exp=""/>
-        <constraint field="staticpress1" desc="" exp=""/>
-        <constraint field="nodetype_2" desc="" exp=""/>
-        <constraint field="staticpress2" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="node_1" hidden="0" width="-1" type="field"/>
-          <column name="node_2" hidden="0" width="-1" type="field"/>
-          <column name="elevation1" hidden="0" width="-1" type="field"/>
-          <column name="depth1" hidden="0" width="-1" type="field"/>
-          <column name="elevation2" hidden="0" width="-1" type="field"/>
-          <column name="depth2" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="custom_length" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="cat_arctype_id" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_1" hidden="0" width="-1" type="field"/>
-          <column name="staticpress1" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_2" hidden="0" width="-1" type="field"/>
-          <column name="staticpress2" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6130,79 +6378,79 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="arc_type"/>
-        <field editable="1" name="arccat_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_arctype_id"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="custom_length"/>
-        <field editable="1" name="depth1"/>
-        <field editable="1" name="depth2"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation1"/>
-        <field editable="1" name="elevation2"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_1"/>
-        <field editable="1" name="node_2"/>
-        <field editable="1" name="nodetype_1"/>
-        <field editable="1" name="nodetype_2"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpress1"/>
-        <field editable="1" name="staticpress2"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="arc_type" editable="1"/>
+        <field name="arccat_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_arctype_id" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="custom_length" editable="1"/>
+        <field name="depth1" editable="1"/>
+        <field name="depth2" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation1" editable="1"/>
+        <field name="elevation2" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_1" editable="1"/>
+        <field name="node_2" editable="1"/>
+        <field name="nodetype_1" editable="1"/>
+        <field name="nodetype_2" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpress1" editable="1"/>
+        <field name="staticpress2" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -6283,7 +6531,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxcircle20180403155702431</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxcircle" (geom_polygon) sql=</datasource>
       <keywordList>
@@ -6343,26 +6591,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="115,189,167,0"/>
-              <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="227,26,28,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="115,189,167,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="227,26,28,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6380,21 +6628,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6403,8 +6651,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6416,20 +6664,20 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6461,14 +6709,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
+        <field name="id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_cad_auxpoint20180403155702690</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cad_auxpoint" (geom_point) sql=</datasource>
       <keywordList>
@@ -6528,33 +6776,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6572,21 +6820,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6595,8 +6843,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6608,20 +6856,20 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6653,14 +6901,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
+        <field name="id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -6719,7 +6967,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -6743,179 +6991,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule label="Greentap" scalemindenom="1" key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; = 'GREENTAP'" symbol="0"/>
-          <rule label="Wjoin" scalemindenom="1" key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='WJOIN'" symbol="1"/>
-          <rule label="Tap" scalemindenom="1" key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='TAP'" symbol="2"/>
-          <rule label="Fountain" scalemindenom="1" key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='FOUNTAIN'" symbol="3"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6931,21 +7179,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7020,6 +7268,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -7125,6 +7380,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -7139,6 +7401,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -7153,6 +7422,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -7454,6 +7730,27 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="connec_id" name="" index="0"/>
@@ -7466,372 +7763,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="7"/>
         <alias field="macroexpl_id" name="" index="8"/>
         <alias field="sector_id" name="" index="9"/>
-        <alias field="macrosector_id" name="" index="10"/>
-        <alias field="customer_code" name="" index="11"/>
-        <alias field="cat_matcat_id" name="" index="12"/>
-        <alias field="cat_pnom" name="" index="13"/>
-        <alias field="cat_dnom" name="" index="14"/>
-        <alias field="connec_length" name="" index="15"/>
-        <alias field="state" name="" index="16"/>
-        <alias field="state_type" name="" index="17"/>
-        <alias field="n_hydrometer" name="" index="18"/>
-        <alias field="arc_id" name="" index="19"/>
-        <alias field="annotation" name="" index="20"/>
-        <alias field="observ" name="" index="21"/>
-        <alias field="comment" name="" index="22"/>
-        <alias field="minsector_id" name="" index="23"/>
-        <alias field="dma_id" name="" index="24"/>
-        <alias field="macrodma_id" name="" index="25"/>
-        <alias field="presszone_id" name="" index="26"/>
-        <alias field="staticpressure" name="" index="27"/>
-        <alias field="dqa_id" name="" index="28"/>
-        <alias field="macrodqa_id" name="" index="29"/>
-        <alias field="soilcat_id" name="" index="30"/>
-        <alias field="function_type" name="" index="31"/>
-        <alias field="category_type" name="" index="32"/>
-        <alias field="fluid_type" name="" index="33"/>
-        <alias field="location_type" name="" index="34"/>
-        <alias field="workcat_id" name="" index="35"/>
-        <alias field="workcat_id_end" name="" index="36"/>
-        <alias field="buildercat_id" name="" index="37"/>
-        <alias field="builtdate" name="" index="38"/>
-        <alias field="enddate" name="" index="39"/>
-        <alias field="ownercat_id" name="" index="40"/>
-        <alias field="muni_id" name="" index="41"/>
-        <alias field="postcode" name="" index="42"/>
-        <alias field="district_id" name="" index="43"/>
-        <alias field="streetname" name="" index="44"/>
-        <alias field="postnumber" name="" index="45"/>
-        <alias field="postcomplement" name="" index="46"/>
-        <alias field="streetname2" name="" index="47"/>
-        <alias field="postnumber2" name="" index="48"/>
-        <alias field="postcomplement2" name="" index="49"/>
-        <alias field="descript" name="" index="50"/>
-        <alias field="svg" name="" index="51"/>
-        <alias field="rotation" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="connectype_id" name="" index="63"/>
-        <alias field="feature_id" name="" index="64"/>
-        <alias field="featurecat_id" name="" index="65"/>
-        <alias field="pjoint_id" name="" index="66"/>
-        <alias field="pjoint_type" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connec_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="connec_length" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="n_hydrometer" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="connectype_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="n_hydrometer" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connectype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connec_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="connec_length" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="n_hydrometer" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="connectype_id" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="connec_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="connecat_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="connec_length" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="n_hydrometer" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="connectype_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_type" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7863,78 +8188,78 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="connec_length"/>
-        <field editable="1" name="connec_type"/>
-        <field editable="1" name="connecat_id"/>
-        <field editable="1" name="connectype_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="n_hydrometer"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="pjoint_id"/>
-        <field editable="1" name="pjoint_type"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="connec_id" editable="1"/>
+        <field name="connec_length" editable="1"/>
+        <field name="connec_type" editable="1"/>
+        <field name="connecat_id" editable="1"/>
+        <field name="connectype_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="n_hydrometer" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pjoint_id" editable="1"/>
+        <field name="pjoint_type" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -8014,7 +8339,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -8067,7 +8392,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -8091,586 +8416,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-          <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-          <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot; +180"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-                <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@4" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -8680,611 +9005,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule scalemindenom="1" key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{750be282-d4cc-4137-9551-e68430260327}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -9440,27 +9765,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9469,8 +9794,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9479,8 +9804,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9489,8 +9814,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9499,16 +9824,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -9516,8 +9844,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9526,8 +9854,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9536,23 +9864,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -9560,8 +9894,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9570,34 +9904,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9606,16 +9934,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -9641,81 +9972,82 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="x_label" applyOnUpdate="0" expression=""/>
-        <default field="y_label" applyOnUpdate="0" expression=""/>
-        <default field="rotation_label" applyOnUpdate="0" expression=""/>
-        <default field="offset_label" applyOnUpdate="0" expression=""/>
-        <default field="direction_arrow" applyOnUpdate="0" expression=""/>
-        <default field="x_symbol" applyOnUpdate="0" expression=""/>
-        <default field="y_symbol" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="offset_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="direction_arrow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="x_label" desc="" exp=""/>
-        <constraint field="y_label" desc="" exp=""/>
-        <constraint field="rotation_label" desc="" exp=""/>
-        <constraint field="offset_label" desc="" exp=""/>
-        <constraint field="direction_arrow" desc="" exp=""/>
-        <constraint field="x_symbol" desc="" exp=""/>
-        <constraint field="y_symbol" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="x_label" hidden="0" width="-1" type="field"/>
-          <column name="y_label" hidden="0" width="-1" type="field"/>
-          <column name="rotation_label" hidden="0" width="-1" type="field"/>
-          <column name="offset_label" hidden="0" width="-1" type="field"/>
-          <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-          <column name="x_symbol" hidden="0" width="-1" type="field"/>
-          <column name="y_symbol" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9747,24 +10079,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="direction_arrow"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="offset_label"/>
-        <field editable="1" name="rotation_label"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="x_label"/>
-        <field editable="1" name="x_symbol"/>
-        <field editable="1" name="y_label"/>
-        <field editable="1" name="y_symbol"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="direction_arrow" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="offset_label" editable="1"/>
+        <field name="rotation_label" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="x_label" editable="1"/>
+        <field name="x_symbol" editable="1"/>
+        <field name="y_label" editable="1"/>
+        <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -9785,7 +10118,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -9844,7 +10177,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -9868,145 +10201,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dma1-1d" value="dma1-1d" symbol="0"/>
-          <category render="true" label="dma1-2d" value="dma1-2d" symbol="1"/>
-          <category render="true" label="dma2-1d" value="dma2-1d" symbol="2"/>
-          <category render="true" label="source-1" value="source-1" symbol="3"/>
-          <category render="true" label="source-2" value="source-2" symbol="4"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10024,27 +10357,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="dma_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10053,8 +10386,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10063,8 +10396,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10073,8 +10406,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10083,8 +10416,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10093,8 +10426,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10103,8 +10436,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10113,8 +10446,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10123,8 +10456,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10133,8 +10466,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10143,8 +10476,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10153,8 +10486,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10163,8 +10496,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10195,74 +10528,74 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="minc" applyOnUpdate="0" expression=""/>
-        <default field="maxc" applyOnUpdate="0" expression=""/>
-        <default field="effc" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dma_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="effc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="minc" desc="" exp=""/>
-        <constraint field="maxc" desc="" exp=""/>
-        <constraint field="effc" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" notificationMessage="" id="{be5d940b-02fd-451d-a305-acaddf30c925}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="176" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="minc" hidden="0" width="-1" type="field"/>
-          <column name="maxc" hidden="0" width="-1" type="field"/>
-          <column name="effc" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10294,18 +10627,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="effc"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="maxc"/>
-        <field editable="1" name="minc"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="effc" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="maxc" editable="1"/>
+        <field name="minc" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -10325,7 +10658,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -10384,7 +10717,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -10408,122 +10741,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dqa1-1d" value="dqa1-1d" symbol="0"/>
-          <category render="true" label="dqa1-1s" value="dqa1-1s" symbol="1"/>
-          <category render="true" label="dqa2-1d" value="dqa2-1d" symbol="2"/>
-          <category render="true" label="dqa2-1s" value="dqa2-1s" symbol="3"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10546,21 +10879,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10569,8 +10902,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10579,8 +10912,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10589,8 +10922,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10599,8 +10932,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10609,8 +10942,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10619,8 +10952,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10629,8 +10962,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10639,8 +10972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10649,8 +10982,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10659,8 +10992,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10689,61 +11022,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_type" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dqa_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="dqa_type" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_type" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10775,17 +11108,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="dqa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="nodeparent"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="dqa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="nodeparent" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -10804,13 +11137,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -10863,7 +11190,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -10887,33 +11214,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10931,21 +11258,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10953,21 +11280,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10975,8 +11311,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10985,41 +11321,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CANCELED FICTICIOUS" type="QString" value="95"/>
-                  <Option name="CANCELED PLANIFIED" type="QString" value="96"/>
-                  <Option name="DONE FICTICIOUS" type="QString" value="97"/>
-                  <Option name="DONE PLANIFIED" type="QString" value="98"/>
-                  <Option name="FICTICIUS" type="QString" value="99"/>
-                  <Option name="OBSOLETE" type="QString" value="1"/>
-                  <Option name="ON_SERVICE" type="QString" value="2"/>
-                  <Option name="PLANIFIED" type="QString" value="3"/>
-                  <Option name="PROVISIONAL" type="QString" value="5"/>
-                  <Option name="RECONSTRUCT" type="QString" value="4"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11028,8 +11351,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11038,8 +11361,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11048,8 +11371,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11057,42 +11380,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Category" type="QString" value="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Location" type="QString" value="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Fluid" type="QString" value="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11100,27 +11420,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="builder1" type="QString" value="builder1"/>
-                  <Option name="builder2" type="QString" value="builder2"/>
-                  <Option name="builder3" type="QString" value="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11129,8 +11451,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11139,22 +11461,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="owner1" type="QString" value="owner1"/>
-                  <Option name="owner2" type="QString" value="owner2"/>
-                  <Option name="owner3" type="QString" value="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11163,8 +11481,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11173,21 +11491,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11196,8 +11511,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11206,8 +11521,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11216,8 +11531,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11226,16 +11541,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11243,21 +11561,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11294,142 +11619,147 @@ def my_form_open(dialog, layer, feature):
         <alias field="inventory" name="inventory" index="27"/>
         <alias field="undelete" name="undelete" index="28"/>
         <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="element_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elementcat_id" applyOnUpdate="0" expression=""/>
-        <default field="elementtype_id" applyOnUpdate="0" expression=""/>
-        <default field="serial_number" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="num_elements" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="element_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementtype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="serial_number" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_elements" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="element_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elementcat_id" desc="" exp=""/>
-        <constraint field="elementtype_id" desc="" exp=""/>
-        <constraint field="serial_number" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="num_elements" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="element_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elementcat_id" hidden="0" width="-1" type="field"/>
-          <column name="serial_number" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="num_elements" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="elementtype_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11461,36 +11791,37 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="element_id"/>
-        <field editable="1" name="elementcat_id"/>
-        <field editable="1" name="elementtype_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="num_elements"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="serial_number"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="element_id" editable="1"/>
+        <field name="elementcat_id" editable="1"/>
+        <field name="elementtype_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="num_elements" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="serial_number" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="buildercat_id"/>
@@ -11514,6 +11845,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -11535,7 +11867,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11594,7 +11926,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -11618,26 +11950,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11655,37 +11987,43 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="expl_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11694,20 +12032,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Macroexploitation-1" type="QString" value="1"/>
-                  <Option name="Undefined" type="QString" value="0"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11716,23 +12052,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11748,42 +12093,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="expl_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="168" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11815,12 +12160,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -11834,7 +12179,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11842,7 +12187,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_connec_3f7dd337_6df0_4fdc_a8e5_b39cf5df82e3</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_connec" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_connec" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -11900,33 +12245,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="164,113,88,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11939,7 +12284,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -12072,61 +12417,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -12147,7 +12492,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_edit_inp_demand20180212154336936</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_demand" sql=</datasource>
       <keywordList>
@@ -12174,6 +12519,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -12190,7 +12544,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -12212,7 +12574,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12221,18 +12583,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="node_id">
+        <field name="feature_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12241,54 +12603,48 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="pattern_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="dma02_period05" type="QString" value="dma02_period05"/>
-                  <Option name="dma02_period06" type="QString" value="dma02_period06"/>
-                  <Option name="dma02_period07" type="QString" value="dma02_period07"/>
-                  <Option name="dma02_unitary" type="QString" value="dma02_unitary"/>
-                  <Option name="dma03_period05" type="QString" value="dma03_period05"/>
-                  <Option name="dma03_period06" type="QString" value="dma03_period06"/>
-                  <Option name="dma03_period07" type="QString" value="dma03_period07"/>
-                  <Option name="dma03_unitary" type="QString" value="dma03_unitary"/>
-                  <Option name="pattern_01" type="QString" value="pattern_01"/>
-                  <Option name="pattern_02" type="QString" value="pattern_02"/>
-                  <Option name="pattern_03" type="QString" value="pattern_03"/>
-                  <Option name="pattern_hydrant" type="QString" value="pattern_hydrant"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="deman_type">
-          <editWidget type="ValueMap">
+        <field name="demand_type">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CRM PERIOD" type="QString" value="2"/>
-                  <Option name="ESTIMATED" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dscenario_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Hydrants_50%" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="feature_type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12296,51 +12652,56 @@ def my_form_open(dialog, layer, feature):
       </fieldConfiguration>
       <aliases>
         <alias field="id" name="id" index="0"/>
-        <alias field="node_id" name="node_id" index="1"/>
+        <alias field="feature_id" name="" index="1"/>
         <alias field="demand" name="demand" index="2"/>
         <alias field="pattern_id" name="pattern_id" index="3"/>
-        <alias field="deman_type" name="deman_type" index="4"/>
+        <alias field="demand_type" name="" index="4"/>
         <alias field="dscenario_id" name="dscenario_id" index="5"/>
+        <alias field="feature_type" name="" index="6"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="deman_type" applyOnUpdate="0" expression=""/>
-        <default field="dscenario_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="demand_type" expression=""/>
+        <default applyOnUpdate="0" field="dscenario_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="deman_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dscenario_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dscenario_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="deman_type" desc="" exp=""/>
-        <constraint field="dscenario_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="demand_type" desc=""/>
+        <constraint exp="" field="dscenario_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="demand" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="deman_type" hidden="0" width="-1" type="field"/>
-          <column name="dscenario_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dscenario_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="demand_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12372,19 +12733,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="deman_type"/>
-        <field editable="1" name="demand"/>
-        <field editable="1" name="dscenario_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pattern_id"/>
+        <field name="deman_type" editable="1"/>
+        <field name="demand" editable="1"/>
+        <field name="demand_type" editable="1"/>
+        <field name="dscenario_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="pattern_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="demand"/>
+        <field labelOnTop="0" name="demand_type"/>
+        <field labelOnTop="0" name="dscenario_id"/>
+        <field labelOnTop="0" name="feature_id"/>
+        <field labelOnTop="0" name="feature_type"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="pattern_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12392,7 +12764,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_inlet_a8f4dbbd_7a09_47b1_8113_5ff238761c81</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_inlet" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_inlet" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -12450,33 +12822,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="135,221,121,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="135,221,121,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12489,7 +12861,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -12646,70 +13018,70 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="initlevel" applyOnUpdate="0" expression=""/>
-        <default field="minlevel" applyOnUpdate="0" expression=""/>
-        <default field="maxlevel" applyOnUpdate="0" expression=""/>
-        <default field="diameter" applyOnUpdate="0" expression=""/>
-        <default field="minvol" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="initlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="diameter" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minvol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="initlevel" desc="" exp=""/>
-        <constraint field="minlevel" desc="" exp=""/>
-        <constraint field="maxlevel" desc="" exp=""/>
-        <constraint field="diameter" desc="" exp=""/>
-        <constraint field="minvol" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -12730,7 +13102,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12738,7 +13110,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_junction_11ec702e_1241_4082_a3ad_9d41acbd369f</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_junction" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_junction" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -12796,33 +13168,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12835,7 +13207,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -12944,52 +13316,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13010,7 +13382,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13018,7 +13390,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_pipe_7cac74d1_cc0f_43d5_a009_cdb79d99644a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pipe" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pipe" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13076,37 +13448,37 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="30,128,239,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="30,128,239,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineWidth" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineWidth">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xd;&#xa;WHEN  @map_scale  &lt;= 4000 THEN 0.55&#xd;&#xa;WHEN @map_scale  > 4000 THEN  &quot;cat_dnom&quot; /1000&#xd;&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13119,7 +13491,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13260,64 +13632,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="custom_roughness" applyOnUpdate="0" expression=""/>
-        <default field="custom_dint" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="custom_roughness" expression=""/>
+        <default applyOnUpdate="0" field="custom_dint" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_roughness" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_dint" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_roughness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_dint" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="custom_roughness" desc="" exp=""/>
-        <constraint field="custom_dint" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="custom_roughness" desc=""/>
+        <constraint exp="" field="custom_dint" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13338,7 +13710,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13346,7 +13718,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_pump_6ec0af5d_5cc1_471e_b7c1_0843b1666242</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pump" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pump" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13404,33 +13776,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="92,146,179,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="92,146,179,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13443,7 +13815,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13600,70 +13972,70 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="power" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="speed" applyOnUpdate="0" expression=""/>
-        <default field="pattern" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="pump_type" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="power" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="speed" expression=""/>
+        <default applyOnUpdate="0" field="pattern" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="pump_type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="power" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="speed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pump_type" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="power" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="speed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pump_type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="power" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="speed" desc="" exp=""/>
-        <constraint field="pattern" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="pump_type" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="power" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="speed" desc=""/>
+        <constraint exp="" field="pattern" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="pump_type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13684,7 +14056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13692,7 +14064,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_reservoir_8e4b7f20_0323_4b40_b9e0_3fe1f70c0f71</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_reservoir" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_reservoir" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13750,33 +14122,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,203,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,203,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13789,7 +14161,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -13898,52 +14270,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -13964,7 +14336,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -13972,7 +14344,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_shortpipe_33c10d7c_0592_45f7_9283_87b0eed50b27</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_shortpipe" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_shortpipe" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14030,33 +14402,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14069,7 +14441,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -14194,58 +14566,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -14266,9 +14638,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14326,33 +14698,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="2.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14365,7 +14737,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -14514,67 +14886,67 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="initlevel" applyOnUpdate="0" expression=""/>
-        <default field="minlevel" applyOnUpdate="0" expression=""/>
-        <default field="maxlevel" applyOnUpdate="0" expression=""/>
-        <default field="diameter" applyOnUpdate="0" expression=""/>
-        <default field="minvol" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="initlevel" expression=""/>
+        <default applyOnUpdate="0" field="minlevel" expression=""/>
+        <default applyOnUpdate="0" field="maxlevel" expression=""/>
+        <default applyOnUpdate="0" field="diameter" expression=""/>
+        <default applyOnUpdate="0" field="minvol" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="initlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxlevel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="diameter" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minvol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="initlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxlevel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="diameter" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minvol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="initlevel" desc="" exp=""/>
-        <constraint field="minlevel" desc="" exp=""/>
-        <constraint field="maxlevel" desc="" exp=""/>
-        <constraint field="diameter" desc="" exp=""/>
-        <constraint field="minvol" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="initlevel" desc=""/>
+        <constraint exp="" field="minlevel" desc=""/>
+        <constraint exp="" field="maxlevel" desc=""/>
+        <constraint exp="" field="diameter" desc=""/>
+        <constraint exp="" field="minvol" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -14595,7 +14967,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -14603,7 +14975,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_inp_valve_ed852bbb_ae38_4039_86b1_6cca6dadd1ee</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_valve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_valve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14661,33 +15033,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="130,85,101,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="130,85,101,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14700,7 +15072,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -14857,70 +15229,70 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="valv_type" applyOnUpdate="0" expression=""/>
-        <default field="pressure" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="coef_loss" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="valv_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="coef_loss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="valv_type" desc="" exp=""/>
-        <constraint field="pressure" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="coef_loss" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -14941,9 +15313,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -15001,31 +15373,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="111,182,175,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.66"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="111,182,175,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.66" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15038,7 +15410,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
@@ -15219,79 +15591,79 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="valv_type" applyOnUpdate="0" expression=""/>
-        <default field="pressure" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="coef_loss" applyOnUpdate="0" expression=""/>
-        <default field="curve_id" applyOnUpdate="0" expression=""/>
-        <default field="minorloss" applyOnUpdate="0" expression=""/>
-        <default field="to_arc" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="valv_type" expression=""/>
+        <default applyOnUpdate="0" field="pressure" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="coef_loss" expression=""/>
+        <default applyOnUpdate="0" field="curve_id" expression=""/>
+        <default applyOnUpdate="0" field="minorloss" expression=""/>
+        <default applyOnUpdate="0" field="to_arc" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="valv_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="coef_loss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="curve_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minorloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="to_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="valv_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="coef_loss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="curve_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minorloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="to_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="valv_type" desc="" exp=""/>
-        <constraint field="pressure" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="coef_loss" desc="" exp=""/>
-        <constraint field="curve_id" desc="" exp=""/>
-        <constraint field="minorloss" desc="" exp=""/>
-        <constraint field="to_arc" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="valv_type" desc=""/>
+        <constraint exp="" field="pressure" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="coef_loss" desc=""/>
+        <constraint exp="" field="curve_id" desc=""/>
+        <constraint exp="" field="minorloss" desc=""/>
+        <constraint exp="" field="to_arc" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -15312,7 +15684,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15372,7 +15744,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -15396,69 +15768,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -15478,27 +15850,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="link_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15507,24 +15879,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15533,24 +15899,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15559,92 +15919,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrosector_01" type="QString" value="1"/>
-                  <Option name="macrosector_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15653,8 +15989,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15663,8 +15999,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -15672,28 +16008,40 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -15720,86 +16068,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="link_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="exit_type" applyOnUpdate="0" expression=""/>
-        <default field="exit_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="userdefined_geom" applyOnUpdate="0" expression=""/>
-        <default field="ispsectorgeom" applyOnUpdate="0" expression=""/>
-        <default field="psector_rowid" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="vnode_topelev" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="link_id" notnull_strength="2" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="userdefined_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ispsectorgeom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_rowid" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vnode_topelev" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="link_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="exit_type" desc="" exp=""/>
-        <constraint field="exit_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="userdefined_geom" desc="" exp=""/>
-        <constraint field="ispsectorgeom" desc="" exp=""/>
-        <constraint field="psector_rowid" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="vnode_topelev" desc="" exp=""/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;sector_id&quot;">
+      <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="link_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="exit_type" hidden="0" width="-1" type="field"/>
-          <column name="exit_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="userdefined_geom" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="ispsectorgeom" hidden="0" width="-1" type="field"/>
-          <column name="psector_rowid" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="vnode_topelev" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15831,23 +16179,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="exit_id"/>
-        <field editable="1" name="exit_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="ispsectorgeom"/>
-        <field editable="1" name="link_id"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="psector_rowid"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="userdefined_geom"/>
-        <field editable="1" name="vnode_topelev"/>
+        <field name="dma_id" editable="1"/>
+        <field name="exit_id" editable="1"/>
+        <field name="exit_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="ispsectorgeom" editable="1"/>
+        <field name="link_id" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="psector_rowid" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="userdefined_geom" editable="1"/>
+        <field name="vnode_topelev" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -15872,7 +16220,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15931,7 +16279,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15955,989 +16303,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule label="Wtp" key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WTP'" symbol="0"/>
-          <rule label="Waterwell" key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WATERWELL'" symbol="1"/>
-          <rule label="Source" key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'SOURCE'" symbol="2"/>
-          <rule label="Tank" key="{5d885b4a-fd95-42b2-8da9-717face5a272}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'TANK'" symbol="3"/>
-          <rule label="Expantank" key="{eed06555-2d38-4bfe-b114-13e014b63af1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" symbol="4"/>
-          <rule label="Filter" key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FILTER'" symbol="5"/>
-          <rule label="Flexunion" key="{9f0ffeda-84af-4676-9263-119eb6042786}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FLEXUNION'" symbol="6"/>
-          <rule label="Hydrant" key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'HYDRANT'" symbol="7"/>
-          <rule label="Meter" key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'METER'" symbol="8"/>
-          <rule label="Netelement" key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETELEMENT'" symbol="9"/>
-          <rule label="Netsamplepoint" key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" symbol="10"/>
-          <rule label="Pump" key="{01479095-8f9e-40cf-b92b-6e13874561ae}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'PUMP'" symbol="11"/>
-          <rule label="Register" key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REGISTER'" symbol="12"/>
-          <rule label="Manhole" key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'MANHOLE'" symbol="13"/>
-          <rule label="Reduction" key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REDUCTION'" symbol="14"/>
-          <rule label="Valve" key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'VALVE'" symbol="15"/>
-          <rule label="Junction" key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'JUNCTION'" symbol="16"/>
-          <rule label="Netwjoin" key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" scalemaxdenom="1500" filter="&quot;sys_type&quot; = 'NETWJOIN'" symbol="17"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="10" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="11" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="12" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="13" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="14" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="15" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="16" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="17" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="7" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="8" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="9" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16954,21 +17302,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17071,6 +17419,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -17141,6 +17496,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -17155,6 +17517,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -17169,6 +17538,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -17449,6 +17825,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="node_id" name="" index="0"/>
@@ -17465,348 +17876,384 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="11"/>
         <alias field="macroexpl_id" name="" index="12"/>
         <alias field="sector_id" name="" index="13"/>
-        <alias field="macrosector_id" name="" index="14"/>
-        <alias field="arc_id" name="" index="15"/>
-        <alias field="parent_id" name="" index="16"/>
-        <alias field="state" name="" index="17"/>
-        <alias field="state_type" name="" index="18"/>
-        <alias field="annotation" name="" index="19"/>
-        <alias field="observ" name="" index="20"/>
-        <alias field="comment" name="" index="21"/>
-        <alias field="minsector_id" name="" index="22"/>
-        <alias field="dma_id" name="" index="23"/>
-        <alias field="macrodma_id" name="" index="24"/>
-        <alias field="presszone_id" name="" index="25"/>
-        <alias field="staticpressure" name="" index="26"/>
-        <alias field="dqa_id" name="" index="27"/>
-        <alias field="macrodqa_id" name="" index="28"/>
-        <alias field="soilcat_id" name="" index="29"/>
-        <alias field="function_type" name="" index="30"/>
-        <alias field="category_type" name="" index="31"/>
-        <alias field="fluid_type" name="" index="32"/>
-        <alias field="location_type" name="" index="33"/>
-        <alias field="workcat_id" name="" index="34"/>
-        <alias field="workcat_id_end" name="" index="35"/>
-        <alias field="builtdate" name="" index="36"/>
-        <alias field="enddate" name="" index="37"/>
-        <alias field="buildercat_id" name="" index="38"/>
-        <alias field="ownercat_id" name="" index="39"/>
-        <alias field="muni_id" name="" index="40"/>
-        <alias field="postcode" name="" index="41"/>
-        <alias field="district_id" name="" index="42"/>
-        <alias field="streetname" name="" index="43"/>
-        <alias field="postnumber" name="" index="44"/>
-        <alias field="postcomplement" name="" index="45"/>
-        <alias field="streetname2" name="" index="46"/>
-        <alias field="postnumber2" name="" index="47"/>
-        <alias field="postcomplement2" name="" index="48"/>
-        <alias field="descript" name="" index="49"/>
-        <alias field="svg" name="" index="50"/>
-        <alias field="rotation" name="" index="51"/>
-        <alias field="link" name="" index="52"/>
-        <alias field="verified" name="" index="53"/>
-        <alias field="undelete" name="" index="54"/>
-        <alias field="label" name="" index="55"/>
-        <alias field="label_x" name="" index="56"/>
-        <alias field="label_y" name="" index="57"/>
-        <alias field="label_rotation" name="" index="58"/>
-        <alias field="publish" name="" index="59"/>
-        <alias field="inventory" name="" index="60"/>
-        <alias field="hemisphere" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="nodetype_id" name="" index="63"/>
-        <alias field="tstamp" name="" index="64"/>
-        <alias field="insert_user" name="" index="65"/>
-        <alias field="lastupdate" name="" index="66"/>
-        <alias field="lastupdate_user" name="" index="67"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="parent_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="hemisphere" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_id" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="parent_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hemisphere" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="parent_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="hemisphere" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="nodetype_id" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="node_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="nodecat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="parent_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="hemisphere" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_id" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17838,74 +18285,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="hemisphere"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="node_type"/>
-        <field editable="1" name="nodecat_id"/>
-        <field editable="1" name="nodetype_id"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="parent_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="hemisphere" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="node_type" editable="1"/>
+        <field name="nodecat_id" editable="1"/>
+        <field name="nodetype_id" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="parent_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -17981,7 +18428,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18014,6 +18461,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -18030,7 +18486,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -18047,33 +18511,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="22,186,107,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="22,186,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18082,11 +18546,29 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18095,19 +18577,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="visitcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Test" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18116,8 +18597,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18126,8 +18607,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18136,8 +18617,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18146,8 +18627,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18156,21 +18637,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18189,48 +18667,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="visitcat_id" applyOnUpdate="0" expression=""/>
-        <default field="ext_code" applyOnUpdate="0" expression=""/>
-        <default field="startdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="user_name" applyOnUpdate="0" expression=""/>
-        <default field="webclient_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="visitcat_id" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="startdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="user_name" expression=""/>
+        <default applyOnUpdate="0" field="webclient_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="visitcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ext_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="startdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="user_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="webclient_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="visitcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="startdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="user_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="webclient_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="visitcat_id" desc="" exp=""/>
-        <constraint field="ext_code" desc="" exp=""/>
-        <constraint field="startdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="user_name" desc="" exp=""/>
-        <constraint field="webclient_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="visitcat_id" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="startdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="user_name" desc=""/>
+        <constraint exp="" field="webclient_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="startdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="user_name" hidden="0" width="-1" type="field"/>
-          <column name="webclient_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="startdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="user_name"/>
+          <column type="field" width="-1" hidden="0" name="webclient_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="visitcat_id"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18242,25 +18722,50 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="ext_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="startdate"/>
-        <field editable="1" name="user_name"/>
-        <field editable="1" name="visitcat_id"/>
-        <field editable="1" name="webclient_id"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="ext_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="startdate" editable="1"/>
+        <field name="user_name" editable="1"/>
+        <field name="visitcat_id" editable="1"/>
+        <field name="webclient_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="enddate"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="startdate"/>
+        <field labelOnTop="0" name="user_name"/>
+        <field labelOnTop="0" name="visitcat_id"/>
+        <field labelOnTop="0" name="webclient_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "user_name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18293,6 +18798,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -18309,7 +18823,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="System">postgres</provider>
       <vectorjoins/>
@@ -18326,26 +18848,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="227,92,92,63"/>
-              <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="166,206,227,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.75"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="227,92,92,63" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="166,206,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.75" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18356,61 +18878,85 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="231,0,0,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="10" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="231,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="10" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;rotation&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
-                  </Option>
-                </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PolygonGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;rotation&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;rotation&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -18425,37 +18971,43 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="psector_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="psector_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="psector_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18464,8 +19016,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18474,36 +19026,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="priority">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="HIGH_PRIORITY" type="QString" value="HIGH_PRIORITY"/>
-                  <Option name="LOW_PRIORITY" type="QString" value="LOW_PRIORITY"/>
-                  <Option name="NORMAL_PRIORITY" type="QString" value="NORMAL_PRIORITY"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="text1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -18511,8 +19066,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18521,8 +19076,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18531,24 +19086,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18557,8 +19106,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18567,16 +19116,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -18584,32 +19136,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Planified" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -18618,23 +19166,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ext_code">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="status">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -18663,94 +19217,94 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="psector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="priority" applyOnUpdate="0" expression=""/>
-        <default field="text1" applyOnUpdate="0" expression=""/>
-        <default field="text2" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="scale" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="atlas_id" applyOnUpdate="0" expression=""/>
-        <default field="gexpenses" applyOnUpdate="0" expression=""/>
-        <default field="vat" applyOnUpdate="0" expression=""/>
-        <default field="other" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="psector_type" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
-        <default field="ext_code" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="psector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="priority" expression=""/>
+        <default applyOnUpdate="0" field="text1" expression=""/>
+        <default applyOnUpdate="0" field="text2" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="scale" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="atlas_id" expression=""/>
+        <default applyOnUpdate="0" field="gexpenses" expression=""/>
+        <default applyOnUpdate="0" field="vat" expression=""/>
+        <default applyOnUpdate="0" field="other" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="psector_type" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="psector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="priority" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="scale" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="atlas_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gexpenses" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vat" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="other" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ext_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="psector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="priority" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="scale" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="atlas_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gexpenses" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="status" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="psector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="priority" desc="" exp=""/>
-        <constraint field="text1" desc="" exp=""/>
-        <constraint field="text2" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="scale" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="atlas_id" desc="" exp=""/>
-        <constraint field="gexpenses" desc="" exp=""/>
-        <constraint field="vat" desc="" exp=""/>
-        <constraint field="other" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="psector_type" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
-        <constraint field="ext_code" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
+        <constraint exp="" field="psector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="priority" desc=""/>
+        <constraint exp="" field="text1" desc=""/>
+        <constraint exp="" field="text2" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="scale" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="atlas_id" desc=""/>
+        <constraint exp="" field="gexpenses" desc=""/>
+        <constraint exp="" field="vat" desc=""/>
+        <constraint exp="" field="other" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="psector_type" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="status" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="psector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="206" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="priority" hidden="0" width="133" type="field"/>
-          <column name="text1" hidden="0" width="-1" type="field"/>
-          <column name="text2" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="234" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="scale" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="atlas_id" hidden="0" width="-1" type="field"/>
-          <column name="gexpenses" hidden="0" width="-1" type="field"/>
-          <column name="vat" hidden="0" width="-1" type="field"/>
-          <column name="other" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="psector_type" hidden="0" width="-1" type="field"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
-          <column name="ext_code" hidden="0" width="-1" type="field"/>
-          <column name="status" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="psector_id"/>
+          <column type="field" width="206" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="133" hidden="0" name="priority"/>
+          <column type="field" width="-1" hidden="0" name="text1"/>
+          <column type="field" width="-1" hidden="0" name="text2"/>
+          <column type="field" width="234" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="scale"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="atlas_id"/>
+          <column type="field" width="-1" hidden="0" name="gexpenses"/>
+          <column type="field" width="-1" hidden="0" name="vat"/>
+          <column type="field" width="-1" hidden="0" name="other"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="psector_type"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
+          <column type="field" width="-1" hidden="0" name="status"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18782,32 +19336,52 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="atlas_id"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="ext_code"/>
-        <field editable="1" name="gexpenses"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="other"/>
-        <field editable="1" name="priority"/>
-        <field editable="1" name="psector_id"/>
-        <field editable="1" name="psector_type"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="scale"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="text1"/>
-        <field editable="1" name="text2"/>
-        <field editable="1" name="vat"/>
+        <field name="active" editable="1"/>
+        <field name="atlas_id" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="ext_code" editable="1"/>
+        <field name="gexpenses" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="other" editable="1"/>
+        <field name="priority" editable="1"/>
+        <field name="psector_id" editable="1"/>
+        <field name="psector_type" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="scale" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="text1" editable="1"/>
+        <field name="text2" editable="1"/>
+        <field name="vat" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="active"/>
+        <field labelOnTop="0" name="atlas_id"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="gexpenses"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="observ"/>
+        <field labelOnTop="0" name="other"/>
+        <field labelOnTop="0" name="priority"/>
+        <field labelOnTop="0" name="psector_id"/>
+        <field labelOnTop="0" name="psector_type"/>
+        <field labelOnTop="0" name="rotation"/>
+        <field labelOnTop="0" name="scale"/>
+        <field labelOnTop="0" name="sector_id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="text1"/>
+        <field labelOnTop="0" name="text2"/>
+        <field labelOnTop="0" name="vat"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -18815,7 +19389,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -18866,7 +19440,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -18890,168 +19464,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="pzone1-1d" value="pzone1-1d" symbol="0"/>
-          <category render="true" label="pzone1-1s" value="pzone1-1s" symbol="1"/>
-          <category render="true" label="pzone1-2d" value="pzone1-2d" symbol="2"/>
-          <category render="true" label="pzone1-2s" value="pzone1-2s" symbol="3"/>
-          <category render="true" label="pzone2-1s" value="pzone2-1s" symbol="4"/>
-          <category render="true" label="pzone2-2d" value="pzone2-2d" symbol="5"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19069,27 +19643,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -19148,42 +19722,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="presszone_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="stylesheet" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19215,12 +19789,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="head"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="stylesheet"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="head" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="stylesheet" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -19234,7 +19808,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="5000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -19287,7 +19861,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -19311,59 +19885,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19380,28 +19954,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer upperValue="0" classificationAttributeExpression="" attributeLegend="1" lowerValue="0" upperHeight="50" diagramType="Histogram" lowerWidth="0" upperWidth="50" lowerHeight="0">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="sample_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19410,8 +19984,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19420,8 +19994,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19430,8 +20004,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19440,122 +20014,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ADAPTATION" type="QString" value="ADAPTATION"/>
-                  <Option name="AIR_VALVE" type="QString" value="AIR_VALVE"/>
-                  <Option name="BYPASS_REGISTER" type="QString" value="BYPASS_REGISTER"/>
-                  <Option name="CHECK_VALVE" type="QString" value="CHECK_VALVE"/>
-                  <Option name="CLORINATHOR" type="QString" value="CLORINATHOR"/>
-                  <Option name="CONTROL_REGISTER" type="QString" value="CONTROL_REGISTER"/>
-                  <Option name="CURVE" type="QString" value="CURVE"/>
-                  <Option name="ENDLINE" type="QString" value="ENDLINE"/>
-                  <Option name="EXPANTANK" type="QString" value="EXPANTANK"/>
-                  <Option name="FILTER" type="QString" value="FILTER"/>
-                  <Option name="FLEXUNION" type="QString" value="FLEXUNION"/>
-                  <Option name="FLOWMETER" type="QString" value="FLOWMETER"/>
-                  <Option name="FL_CONTR_VALVE" type="QString" value="FL_CONTR_VALVE"/>
-                  <Option name="FOUNTAIN" type="QString" value="FOUNTAIN"/>
-                  <Option name="GEN_PURP_VALVE" type="QString" value="GEN_PURP_VALVE"/>
-                  <Option name="GREENTAP" type="QString" value="GREENTAP"/>
-                  <Option name="GREEN_VALVE" type="QString" value="GREEN_VALVE"/>
-                  <Option name="HYDRANT" type="QString" value="HYDRANT"/>
-                  <Option name="JUNCTION" type="QString" value="JUNCTION"/>
-                  <Option name="MANHOLE" type="QString" value="MANHOLE"/>
-                  <Option name="NETELEMENT" type="QString" value="NETELEMENT"/>
-                  <Option name="NETSAMPLEPOINT" type="QString" value="NETSAMPLEPOINT"/>
-                  <Option name="OUTFALL_VALVE" type="QString" value="OUTFALL_VALVE"/>
-                  <Option name="PIPE" type="QString" value="PIPE"/>
-                  <Option name="PRESSURE_METER" type="QString" value="PRESSURE_METER"/>
-                  <Option name="PR_BREAK_VALVE" type="QString" value="PR_BREAK_VALVE"/>
-                  <Option name="PR_REDUC_VALVE" type="QString" value="PR_REDUC_VALVE"/>
-                  <Option name="PR_SUSTA_VALVE" type="QString" value="PR_SUSTA_VALVE"/>
-                  <Option name="PUMP" type="QString" value="PUMP"/>
-                  <Option name="REDUCTION" type="QString" value="REDUCTION"/>
-                  <Option name="REGISTER" type="QString" value="REGISTER"/>
-                  <Option name="SHUTOFF_VALVE" type="QString" value="SHUTOFF_VALVE"/>
-                  <Option name="SOURCE" type="QString" value="SOURCE"/>
-                  <Option name="T" type="QString" value="T"/>
-                  <Option name="TANK" type="QString" value="TANK"/>
-                  <Option name="TAP" type="QString" value="TAP"/>
-                  <Option name="THROTTLE_VALVE" type="QString" value="THROTTLE_VALVE"/>
-                  <Option name="VALVE_REGISTER" type="QString" value="VALVE_REGISTER"/>
-                  <Option name="VARC" type="QString" value="VARC"/>
-                  <Option name="VCONNEC" type="QString" value="VCONNEC"/>
-                  <Option name="WATERWELL" type="QString" value="WATERWELL"/>
-                  <Option name="WATER_CONNECTION" type="QString" value="WATER_CONNECTION"/>
-                  <Option name="WJOIN" type="QString" value="WJOIN"/>
-                  <Option name="WTP" type="QString" value="WTP"/>
-                  <Option name="X" type="QString" value="X"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="presszonecat_id">
-          <editWidget type="ValueMap">
+        <field name="presszone_id">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="pzone1-1d" type="QString" value="3"/>
-                  <Option name="pzone1-1s" type="QString" value="1"/>
-                  <Option name="pzone1-2d" type="QString" value="4"/>
-                  <Option name="pzone1-2s" type="QString" value="2"/>
-                  <Option name="pzone2-1s" type="QString" value="5"/>
-                  <Option name="pzone2-2d" type="QString" value="6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19564,10 +20074,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19576,32 +20087,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="work1" type="QString" value="work1"/>
-                  <Option name="work2" type="QString" value="work2"/>
-                  <Option name="work3" type="QString" value="work3"/>
-                  <Option name="work4" type="QString" value="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -19609,54 +20120,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19665,14 +20150,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option name="AllowMulti" type="QString" value="0"/>
-                <Option name="AllowNull" type="QString" value="0"/>
-                <Option name="FilterExpression" type="QString" value=""/>
-                <Option name="Key" type="QString" value="postnumber"/>
-                <Option name="Layer" type="QString" value="ext_address20171204171433160"/>
-                <Option name="OrderByValue" type="QString" value="0"/>
-                <Option name="UseCompleter" type="QString" value="0"/>
-                <Option name="Value" type="QString" value="postnumber"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -19681,50 +20170,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19733,8 +20200,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19743,8 +20210,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19753,8 +20220,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19763,8 +20230,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19773,8 +20240,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -19783,41 +20250,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -19830,7 +20295,7 @@ def my_form_open(dialog, layer, feature):
         <alias field="featurecat_id" name="featurecat_id" index="4"/>
         <alias field="dma_id" name="dma_id" index="5"/>
         <alias field="macrodma_id" name="macrodma_id" index="6"/>
-        <alias field="presszonecat_id" name="presszonecat_id" index="7"/>
+        <alias field="presszone_id" name="" index="7"/>
         <alias field="state" name="state" index="8"/>
         <alias field="builtdate" name="builtdate" index="9"/>
         <alias field="enddate" name="enddate" index="10"/>
@@ -19856,132 +20321,134 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sample_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="lab_code" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis2_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="place_name" applyOnUpdate="0" expression=""/>
-        <default field="cabinet" applyOnUpdate="0" expression=""/>
-        <default field="observations" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sample_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lab_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis2_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="place_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cabinet" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observations" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sample_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="lab_code" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetaxis2_id" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="place_name" desc="" exp=""/>
-        <constraint field="cabinet" desc="" exp=""/>
-        <constraint field="observations" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sample_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="lab_code" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis2_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="place_name" hidden="0" width="-1" type="field"/>
-          <column name="cabinet" hidden="0" width="-1" type="field"/>
-          <column name="observations" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20013,45 +20480,49 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cabinet"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="lab_code"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observations"/>
-        <field editable="1" name="place_name"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sample_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="streetaxis2_id"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cabinet" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="lab_code" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observations" editable="1"/>
+        <field name="place_name" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sample_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="streetaxis2_id" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -20061,6 +20532,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -20075,7 +20547,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_edit_sector20171204170540567</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_sector" (the_geom) sql=</datasource>
       <keywordList>
@@ -20128,7 +20606,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -20152,144 +20630,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="sector_id" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category render="true" label="0" value="0" symbol="0"/>
-          <category render="true" label="1" value="1" symbol="1"/>
-          <category render="true" label="2" value="2" symbol="2"/>
-          <category render="true" label="3" value="3" symbol="3"/>
-          <category render="true" label="4" value="4" symbol="4"/>
-          <category render="true" label="5" value="5" symbol="5"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20308,21 +20786,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20331,8 +20809,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20341,8 +20819,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20351,8 +20829,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20361,8 +20839,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20371,8 +20849,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20381,8 +20859,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20407,45 +20885,45 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="172" type="field"/>
-          <column name="descript" hidden="0" width="184" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20477,12 +20955,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="name" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -20496,7 +20974,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20555,7 +21033,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -20579,33 +21057,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20616,79 +21094,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="postnumber">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="3" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="PointGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -20702,21 +21180,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20725,19 +21203,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20746,43 +21223,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20791,8 +21243,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20801,21 +21253,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -20823,7 +21272,10 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -20841,50 +21293,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="plot_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="plot_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="plot_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20916,14 +21368,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="plot_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="streetaxis_id"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="plot_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -20939,7 +21391,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -20998,7 +21450,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -21022,26 +21474,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21059,33 +21511,33 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -21094,8 +21546,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21104,19 +21556,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21125,43 +21576,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
-            <config>
-              <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21170,8 +21596,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21180,8 +21606,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21190,8 +21616,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21200,8 +21626,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21210,8 +21636,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21220,21 +21646,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21257,66 +21680,66 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="plot_code" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="complement" applyOnUpdate="0" expression=""/>
-        <default field="placement" applyOnUpdate="0" expression=""/>
-        <default field="square" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="complement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="placement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="square" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="plot_code" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="complement" desc="" exp=""/>
-        <constraint field="placement" desc="" exp=""/>
-        <constraint field="square" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="plot_code" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="complement" hidden="0" width="-1" type="field"/>
-          <column name="placement" hidden="0" width="-1" type="field"/>
-          <column name="square" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21348,18 +21771,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="complement"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="placement"/>
-        <field editable="1" name="plot_code"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="square"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="text"/>
+        <field name="complement" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="placement" editable="1"/>
+        <field name="plot_code" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="square" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="complement"/>
@@ -21379,7 +21802,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="3000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiLineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -21438,7 +21861,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -21462,31 +21885,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21497,79 +21920,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Arial" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0.1875" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0.1875" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="9" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="0.6" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -21583,21 +22006,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21606,8 +22029,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21616,19 +22039,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21637,8 +22059,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21647,32 +22069,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21681,8 +22099,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21701,50 +22119,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="269" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21776,14 +22194,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="text"/>
-        <field editable="1" name="type"/>
+        <field name="code" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="text" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="code"/>
@@ -21799,7 +22217,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Polygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -21852,7 +22276,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -21876,26 +22300,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21914,21 +22338,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21937,8 +22361,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21947,8 +22371,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21957,8 +22381,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21967,8 +22391,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21977,8 +22401,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -21987,8 +22411,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -22005,42 +22429,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="minsector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;minsector_id&quot;">
+      <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22072,12 +22496,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="dma_id"/>
-        <field editable="0" name="dqa_id"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="minsector_id"/>
-        <field editable="0" name="presszonecat_id"/>
-        <field editable="0" name="sector_id"/>
+        <field name="dma_id" editable="0"/>
+        <field name="dqa_id" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="minsector_id" editable="0"/>
+        <field name="presszonecat_id" editable="0"/>
+        <field name="sector_id" editable="0"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -22091,9 +22515,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Line" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22144,7 +22574,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -22168,56 +22598,56 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="76,38,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.7"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="76,38,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.7" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="255,206,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="255,206,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22235,21 +22665,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22292,34 +22722,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22351,10 +22781,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="arc_id"/>
@@ -22366,9 +22796,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22419,7 +22855,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -22443,33 +22879,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="45,84,255,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="0,24,124,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.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="45,84,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,24,124,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22487,21 +22923,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22792,158 +23228,158 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="class" applyOnUpdate="0" expression=""/>
-        <default field="mincut_type" applyOnUpdate="0" expression=""/>
-        <default field="received_date" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_name" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="street_name" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="anl_cause" applyOnUpdate="0" expression=""/>
-        <default field="anl_tstamp" applyOnUpdate="0" expression=""/>
-        <default field="anl_user" applyOnUpdate="0" expression=""/>
-        <default field="anl_descript" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_id" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_type" applyOnUpdate="0" expression=""/>
-        <default field="forecast_start" applyOnUpdate="0" expression=""/>
-        <default field="forecast_end" applyOnUpdate="0" expression=""/>
-        <default field="assigned_to" applyOnUpdate="0" expression=""/>
-        <default field="exec_start" applyOnUpdate="0" expression=""/>
-        <default field="exec_end" applyOnUpdate="0" expression=""/>
-        <default field="exec_user" applyOnUpdate="0" expression=""/>
-        <default field="exec_descript" applyOnUpdate="0" expression=""/>
-        <default field="exec_the_geom" applyOnUpdate="0" expression=""/>
-        <default field="exec_from_plot" applyOnUpdate="0" expression=""/>
-        <default field="exec_depth" applyOnUpdate="0" expression=""/>
-        <default field="exec_appropiate" applyOnUpdate="0" expression=""/>
-        <default field="notified" applyOnUpdate="0" expression=""/>
-        <default field="output" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="mincut_type" expression=""/>
+        <default applyOnUpdate="0" field="received_date" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_name" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="street_name" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="anl_cause" expression=""/>
+        <default applyOnUpdate="0" field="anl_tstamp" expression=""/>
+        <default applyOnUpdate="0" field="anl_user" expression=""/>
+        <default applyOnUpdate="0" field="anl_descript" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_id" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_type" expression=""/>
+        <default applyOnUpdate="0" field="forecast_start" expression=""/>
+        <default applyOnUpdate="0" field="forecast_end" expression=""/>
+        <default applyOnUpdate="0" field="assigned_to" expression=""/>
+        <default applyOnUpdate="0" field="exec_start" expression=""/>
+        <default applyOnUpdate="0" field="exec_end" expression=""/>
+        <default applyOnUpdate="0" field="exec_user" expression=""/>
+        <default applyOnUpdate="0" field="exec_descript" expression=""/>
+        <default applyOnUpdate="0" field="exec_the_geom" expression=""/>
+        <default applyOnUpdate="0" field="exec_from_plot" expression=""/>
+        <default applyOnUpdate="0" field="exec_depth" expression=""/>
+        <default applyOnUpdate="0" field="exec_appropiate" expression=""/>
+        <default applyOnUpdate="0" field="notified" expression=""/>
+        <default applyOnUpdate="0" field="output" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="class" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="mincut_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="received_date" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="street_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_cause" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="assigned_to" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_the_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_from_plot" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_appropiate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="notified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="output" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mincut_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="received_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="street_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_cause" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="assigned_to" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_the_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_from_plot" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_appropiate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="notified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="output" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="class" desc="" exp=""/>
-        <constraint field="mincut_type" desc="" exp=""/>
-        <constraint field="received_date" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="expl_name" desc="" exp=""/>
-        <constraint field="macroexpl_name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="muni_name" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="street_name" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="anl_cause" desc="" exp=""/>
-        <constraint field="anl_tstamp" desc="" exp=""/>
-        <constraint field="anl_user" desc="" exp=""/>
-        <constraint field="anl_descript" desc="" exp=""/>
-        <constraint field="anl_feature_id" desc="" exp=""/>
-        <constraint field="anl_feature_type" desc="" exp=""/>
-        <constraint field="forecast_start" desc="" exp=""/>
-        <constraint field="forecast_end" desc="" exp=""/>
-        <constraint field="assigned_to" desc="" exp=""/>
-        <constraint field="exec_start" desc="" exp=""/>
-        <constraint field="exec_end" desc="" exp=""/>
-        <constraint field="exec_user" desc="" exp=""/>
-        <constraint field="exec_descript" desc="" exp=""/>
-        <constraint field="exec_the_geom" desc="" exp=""/>
-        <constraint field="exec_from_plot" desc="" exp=""/>
-        <constraint field="exec_depth" desc="" exp=""/>
-        <constraint field="exec_appropiate" desc="" exp=""/>
-        <constraint field="notified" desc="" exp=""/>
-        <constraint field="output" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="mincut_type" desc=""/>
+        <constraint exp="" field="received_date" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="expl_name" desc=""/>
+        <constraint exp="" field="macroexpl_name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="muni_name" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="street_name" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="anl_cause" desc=""/>
+        <constraint exp="" field="anl_tstamp" desc=""/>
+        <constraint exp="" field="anl_user" desc=""/>
+        <constraint exp="" field="anl_descript" desc=""/>
+        <constraint exp="" field="anl_feature_id" desc=""/>
+        <constraint exp="" field="anl_feature_type" desc=""/>
+        <constraint exp="" field="forecast_start" desc=""/>
+        <constraint exp="" field="forecast_end" desc=""/>
+        <constraint exp="" field="assigned_to" desc=""/>
+        <constraint exp="" field="exec_start" desc=""/>
+        <constraint exp="" field="exec_end" desc=""/>
+        <constraint exp="" field="exec_user" desc=""/>
+        <constraint exp="" field="exec_descript" desc=""/>
+        <constraint exp="" field="exec_the_geom" desc=""/>
+        <constraint exp="" field="exec_from_plot" desc=""/>
+        <constraint exp="" field="exec_depth" desc=""/>
+        <constraint exp="" field="exec_appropiate" desc=""/>
+        <constraint exp="" field="notified" desc=""/>
+        <constraint exp="" field="output" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="class" hidden="0" width="-1" type="field"/>
-          <column name="mincut_type" hidden="0" width="-1" type="field"/>
-          <column name="received_date" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_name" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="street_name" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="anl_cause" hidden="0" width="-1" type="field"/>
-          <column name="anl_tstamp" hidden="0" width="-1" type="field"/>
-          <column name="anl_user" hidden="0" width="-1" type="field"/>
-          <column name="anl_descript" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_id" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_type" hidden="0" width="-1" type="field"/>
-          <column name="forecast_start" hidden="0" width="-1" type="field"/>
-          <column name="forecast_end" hidden="0" width="-1" type="field"/>
-          <column name="assigned_to" hidden="0" width="-1" type="field"/>
-          <column name="exec_start" hidden="0" width="-1" type="field"/>
-          <column name="exec_end" hidden="0" width="-1" type="field"/>
-          <column name="exec_user" hidden="0" width="-1" type="field"/>
-          <column name="exec_descript" hidden="0" width="-1" type="field"/>
-          <column name="exec_the_geom" hidden="0" width="-1" type="field"/>
-          <column name="exec_from_plot" hidden="0" width="-1" type="field"/>
-          <column name="exec_depth" hidden="0" width="-1" type="field"/>
-          <column name="exec_appropiate" hidden="0" width="-1" type="field"/>
-          <column name="notified" hidden="0" width="-1" type="field"/>
-          <column name="output" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="mincut_type"/>
+          <column type="field" width="-1" hidden="0" name="received_date"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_name"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="street_name"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="anl_cause"/>
+          <column type="field" width="-1" hidden="0" name="anl_tstamp"/>
+          <column type="field" width="-1" hidden="0" name="anl_user"/>
+          <column type="field" width="-1" hidden="0" name="anl_descript"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_id"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_type"/>
+          <column type="field" width="-1" hidden="0" name="forecast_start"/>
+          <column type="field" width="-1" hidden="0" name="forecast_end"/>
+          <column type="field" width="-1" hidden="0" name="assigned_to"/>
+          <column type="field" width="-1" hidden="0" name="exec_start"/>
+          <column type="field" width="-1" hidden="0" name="exec_end"/>
+          <column type="field" width="-1" hidden="0" name="exec_user"/>
+          <column type="field" width="-1" hidden="0" name="exec_descript"/>
+          <column type="field" width="-1" hidden="0" name="exec_the_geom"/>
+          <column type="field" width="-1" hidden="0" name="exec_from_plot"/>
+          <column type="field" width="-1" hidden="0" name="exec_depth"/>
+          <column type="field" width="-1" hidden="0" name="exec_appropiate"/>
+          <column type="field" width="-1" hidden="0" name="notified"/>
+          <column type="field" width="-1" hidden="0" name="output"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22975,41 +23411,41 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="anl_cause"/>
-        <field editable="1" name="anl_descript"/>
-        <field editable="1" name="anl_feature_id"/>
-        <field editable="1" name="anl_feature_type"/>
-        <field editable="1" name="anl_tstamp"/>
-        <field editable="1" name="anl_user"/>
-        <field editable="1" name="assigned_to"/>
-        <field editable="1" name="class"/>
-        <field editable="1" name="exec_appropiate"/>
-        <field editable="1" name="exec_depth"/>
-        <field editable="1" name="exec_descript"/>
-        <field editable="1" name="exec_end"/>
-        <field editable="1" name="exec_from_plot"/>
-        <field editable="1" name="exec_start"/>
-        <field editable="1" name="exec_the_geom"/>
-        <field editable="1" name="exec_user"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="expl_name"/>
-        <field editable="1" name="forecast_end"/>
-        <field editable="1" name="forecast_start"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macroexpl_name"/>
-        <field editable="1" name="mincut_type"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="muni_name"/>
-        <field editable="1" name="notified"/>
-        <field editable="1" name="output"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="received_date"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="street_name"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="anl_cause" editable="1"/>
+        <field name="anl_descript" editable="1"/>
+        <field name="anl_feature_id" editable="1"/>
+        <field name="anl_feature_type" editable="1"/>
+        <field name="anl_tstamp" editable="1"/>
+        <field name="anl_user" editable="1"/>
+        <field name="assigned_to" editable="1"/>
+        <field name="class" editable="1"/>
+        <field name="exec_appropiate" editable="1"/>
+        <field name="exec_depth" editable="1"/>
+        <field name="exec_descript" editable="1"/>
+        <field name="exec_end" editable="1"/>
+        <field name="exec_from_plot" editable="1"/>
+        <field name="exec_start" editable="1"/>
+        <field name="exec_the_geom" editable="1"/>
+        <field name="exec_user" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="expl_name" editable="1"/>
+        <field name="forecast_end" editable="1"/>
+        <field name="forecast_start" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macroexpl_name" editable="1"/>
+        <field name="mincut_type" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="muni_name" editable="1"/>
+        <field name="notified" editable="1"/>
+        <field name="output" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="received_date" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="street_name" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="anl_cause"/>
@@ -23052,9 +23488,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>expl_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -23105,7 +23547,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -23129,33 +23571,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="176,123,103,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="102,46,25,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="176,123,103,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="102,46,25,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23173,21 +23615,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23238,38 +23680,38 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23301,11 +23743,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="connec_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -23318,9 +23760,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -23371,7 +23819,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -23395,33 +23843,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="241,209,66,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="160,134,17,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="241,209,66,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="160,134,17,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23439,21 +23887,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23496,34 +23944,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23555,10 +24003,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23570,9 +24018,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -23623,7 +24077,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -23647,97 +24101,97 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="proposed" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="proposed" symbollevels="0">
         <categories>
-          <category render="true" label="Proposed to close" value="true" symbol="0"/>
-          <category render="true" label="Do not operate" value="false" symbol="1"/>
+          <category render="true" value="true" label="Proposed to close" symbol="0"/>
+          <category render="true" value="false" label="Do not operate" symbol="1"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,55,58,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="134,13,13,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,55,58,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="134,13,13,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="51,160,44,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="6,94,0,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="51,160,44,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="6,94,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="232,113,141,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="232,113,141,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23755,21 +24209,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23844,50 +24298,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="closed" applyOnUpdate="0" expression=""/>
-        <default field="broken" applyOnUpdate="0" expression=""/>
-        <default field="unaccess" applyOnUpdate="0" expression=""/>
-        <default field="proposed" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="unaccess" expression=""/>
+        <default applyOnUpdate="0" field="proposed" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="closed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="broken" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="unaccess" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="proposed" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="unaccess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="proposed" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="closed" desc="" exp=""/>
-        <constraint field="broken" desc="" exp=""/>
-        <constraint field="unaccess" desc="" exp=""/>
-        <constraint field="proposed" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="unaccess" desc=""/>
+        <constraint exp="" field="proposed" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="closed" hidden="0" width="-1" type="field"/>
-          <column name="broken" hidden="0" width="-1" type="field"/>
-          <column name="unaccess" hidden="0" width="-1" type="field"/>
-          <column name="proposed" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="unaccess"/>
+          <column type="field" width="-1" hidden="0" name="proposed"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23919,14 +24373,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="broken"/>
-        <field editable="1" name="closed"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="proposed"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="unaccess"/>
-        <field editable="1" name="work_order"/>
+        <field name="broken" editable="1"/>
+        <field name="closed" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="proposed" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="unaccess" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="broken"/>
@@ -23942,9 +24396,9 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <id>v_plan_current_psector_f06a81e3_8008_44ea_88bf_a0edec25044e</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_current_psector" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='psector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_current_psector" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -23969,6 +24423,15 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -23985,7 +24448,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>__GEOGRAPHICFLAG__</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
       <vectorjoins/>
@@ -24002,26 +24473,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="227,92,92,37"/>
-              <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="197,167,227,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.75"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="227,92,92,37" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="197,167,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.75" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24032,61 +24503,85 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="231,0,0,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="10" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="231,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="10" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="133,182,111,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;rotation&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
-                  </Option>
-                </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PolygonGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;rotation&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;rotation&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -24105,185 +24600,254 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="psector_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="psector_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="psector_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_type">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="descript">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="priority">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_arc">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_node">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_other">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="text2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="rotation">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="scale">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pem">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="gexpenses">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pec">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pec_vat">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="other">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pca">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -24315,109 +24879,106 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="psector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="psector_type" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="priority" applyOnUpdate="0" expression=""/>
-        <default field="total_arc" applyOnUpdate="0" expression=""/>
-        <default field="total_node" applyOnUpdate="0" expression=""/>
-        <default field="total_other" applyOnUpdate="0" expression=""/>
-        <default field="text1" applyOnUpdate="0" expression=""/>
-        <default field="text2" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="scale" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
-        <default field="pem" applyOnUpdate="0" expression=""/>
-        <default field="gexpenses" applyOnUpdate="0" expression=""/>
-        <default field="pec" applyOnUpdate="0" expression=""/>
-        <default field="vat" applyOnUpdate="0" expression=""/>
-        <default field="pec_vat" applyOnUpdate="0" expression=""/>
-        <default field="other" applyOnUpdate="0" expression=""/>
-        <default field="pca" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="psector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="psector_type" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="priority" expression=""/>
+        <default applyOnUpdate="0" field="total_arc" expression=""/>
+        <default applyOnUpdate="0" field="total_node" expression=""/>
+        <default applyOnUpdate="0" field="total_other" expression=""/>
+        <default applyOnUpdate="0" field="text1" expression=""/>
+        <default applyOnUpdate="0" field="text2" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="scale" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
+        <default applyOnUpdate="0" field="pem" expression=""/>
+        <default applyOnUpdate="0" field="gexpenses" expression=""/>
+        <default applyOnUpdate="0" field="pec" expression=""/>
+        <default applyOnUpdate="0" field="vat" expression=""/>
+        <default applyOnUpdate="0" field="pec_vat" expression=""/>
+        <default applyOnUpdate="0" field="other" expression=""/>
+        <default applyOnUpdate="0" field="pca" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="psector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="priority" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="total_arc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="total_node" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="total_other" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="scale" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pem" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gexpenses" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pec" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vat" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pec_vat" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="other" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pca" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="psector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="priority" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_arc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_node" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="scale" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pem" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gexpenses" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pec_vat" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pca" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="psector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="psector_type" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="priority" desc="" exp=""/>
-        <constraint field="total_arc" desc="" exp=""/>
-        <constraint field="total_node" desc="" exp=""/>
-        <constraint field="total_other" desc="" exp=""/>
-        <constraint field="text1" desc="" exp=""/>
-        <constraint field="text2" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="scale" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
-        <constraint field="pem" desc="" exp=""/>
-        <constraint field="gexpenses" desc="" exp=""/>
-        <constraint field="pec" desc="" exp=""/>
-        <constraint field="vat" desc="" exp=""/>
-        <constraint field="pec_vat" desc="" exp=""/>
-        <constraint field="other" desc="" exp=""/>
-        <constraint field="pca" desc="" exp=""/>
+        <constraint exp="" field="psector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="psector_type" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="priority" desc=""/>
+        <constraint exp="" field="total_arc" desc=""/>
+        <constraint exp="" field="total_node" desc=""/>
+        <constraint exp="" field="total_other" desc=""/>
+        <constraint exp="" field="text1" desc=""/>
+        <constraint exp="" field="text2" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="scale" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="active" desc=""/>
+        <constraint exp="" field="pem" desc=""/>
+        <constraint exp="" field="gexpenses" desc=""/>
+        <constraint exp="" field="pec" desc=""/>
+        <constraint exp="" field="vat" desc=""/>
+        <constraint exp="" field="pec_vat" desc=""/>
+        <constraint exp="" field="other" desc=""/>
+        <constraint exp="" field="pca" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="psector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="206" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="priority" hidden="0" width="133" type="field"/>
-          <column name="text1" hidden="0" width="-1" type="field"/>
-          <column name="text2" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="234" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="scale" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="gexpenses" hidden="0" width="-1" type="field"/>
-          <column name="vat" hidden="0" width="-1" type="field"/>
-          <column name="other" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="psector_type" hidden="0" width="-1" type="field"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
-          <column name="total_arc" hidden="0" width="-1" type="field"/>
-          <column name="total_node" hidden="0" width="-1" type="field"/>
-          <column name="total_other" hidden="0" width="-1" type="field"/>
-          <column name="pem" hidden="0" width="-1" type="field"/>
-          <column name="pec" hidden="0" width="-1" type="field"/>
-          <column name="pec_vat" hidden="0" width="-1" type="field"/>
-          <column name="pca" hidden="0" width="-1" type="field"/>
-          <column name="affec_length" hidden="0" width="-1" type="field"/>
-          <column name="plan_length" hidden="0" width="-1" type="field"/>
-          <column name="current_length" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="psector_id"/>
+          <column type="field" width="206" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="133" hidden="0" name="priority"/>
+          <column type="field" width="-1" hidden="0" name="text1"/>
+          <column type="field" width="-1" hidden="0" name="text2"/>
+          <column type="field" width="234" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="scale"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="gexpenses"/>
+          <column type="field" width="-1" hidden="0" name="vat"/>
+          <column type="field" width="-1" hidden="0" name="other"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="psector_type"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
+          <column type="field" width="-1" hidden="0" name="total_arc"/>
+          <column type="field" width="-1" hidden="0" name="total_node"/>
+          <column type="field" width="-1" hidden="0" name="total_other"/>
+          <column type="field" width="-1" hidden="0" name="pem"/>
+          <column type="field" width="-1" hidden="0" name="pec"/>
+          <column type="field" width="-1" hidden="0" name="pec_vat"/>
+          <column type="field" width="-1" hidden="0" name="pca"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24449,31 +25010,31 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="active"/>
-        <field editable="0" name="affec_length"/>
-        <field editable="0" name="current_length"/>
-        <field editable="0" name="descript"/>
-        <field editable="0" name="gexpenses"/>
-        <field editable="0" name="name"/>
-        <field editable="0" name="observ"/>
-        <field editable="0" name="other"/>
-        <field editable="0" name="pca"/>
-        <field editable="0" name="pec"/>
-        <field editable="0" name="pec_vat"/>
-        <field editable="0" name="pem"/>
-        <field editable="0" name="plan_length"/>
-        <field editable="0" name="priority"/>
-        <field editable="0" name="psector_id"/>
-        <field editable="0" name="psector_type"/>
-        <field editable="0" name="rotation"/>
-        <field editable="0" name="scale"/>
-        <field editable="0" name="sector_id"/>
-        <field editable="0" name="text1"/>
-        <field editable="0" name="text2"/>
-        <field editable="0" name="total_arc"/>
-        <field editable="0" name="total_node"/>
-        <field editable="0" name="total_other"/>
-        <field editable="0" name="vat"/>
+        <field name="active" editable="0"/>
+        <field name="affec_length" editable="0"/>
+        <field name="current_length" editable="0"/>
+        <field name="descript" editable="0"/>
+        <field name="gexpenses" editable="0"/>
+        <field name="name" editable="0"/>
+        <field name="observ" editable="0"/>
+        <field name="other" editable="0"/>
+        <field name="pca" editable="0"/>
+        <field name="pec" editable="0"/>
+        <field name="pec_vat" editable="0"/>
+        <field name="pem" editable="0"/>
+        <field name="plan_length" editable="0"/>
+        <field name="priority" editable="0"/>
+        <field name="psector_id" editable="0"/>
+        <field name="psector_type" editable="0"/>
+        <field name="rotation" editable="0"/>
+        <field name="scale" editable="0"/>
+        <field name="sector_id" editable="0"/>
+        <field name="text1" editable="0"/>
+        <field name="text2" editable="0"/>
+        <field name="total_arc" editable="0"/>
+        <field name="total_node" editable="0"/>
+        <field name="total_other" editable="0"/>
+        <field name="vat" editable="0"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="active"/>
@@ -24506,7 +25067,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -24565,7 +25126,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -24589,31 +25150,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="235,163,126,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="235,163,126,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24631,21 +25192,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24654,8 +25215,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24664,8 +25225,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24674,8 +25235,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24684,8 +25245,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24694,8 +25255,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24704,50 +25265,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24756,8 +25305,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24766,23 +25315,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -24790,23 +25345,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="z1">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="z2">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -24814,16 +25375,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="width">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -24831,8 +25395,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24841,8 +25405,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24851,8 +25415,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24861,23 +25425,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_param">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_y">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -24885,8 +25455,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24895,8 +25465,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24905,8 +25475,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24915,8 +25485,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24925,8 +25495,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24935,8 +25505,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24945,8 +25515,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24955,8 +25525,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24965,8 +25535,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24975,8 +25545,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24985,8 +25555,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -24995,8 +25565,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25005,8 +25575,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25015,8 +25585,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25025,8 +25595,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25035,8 +25605,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25045,8 +25615,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25055,8 +25625,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25065,8 +25635,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25075,16 +25645,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="trenchl_cost">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -25092,8 +25665,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25102,8 +25675,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25112,8 +25685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25122,8 +25695,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25132,8 +25705,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25142,8 +25715,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25152,72 +25725,122 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="other_budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="total_budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="builtcost">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="builtdate">
+          <editWidget type="DateTime">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="age">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="aperiod">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="arate">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="amortized">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pending">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -25278,266 +25901,282 @@ def my_form_open(dialog, layer, feature):
         <alias field="budget" name="budget" index="52"/>
         <alias field="other_budget" name="other_budget" index="53"/>
         <alias field="total_budget" name="total_budget" index="54"/>
-        <alias field="age" name="" index="55"/>
-        <alias field="acoeff" name="" index="56"/>
-        <alias field="aperiod" name="" index="57"/>
-        <alias field="arate" name="" index="58"/>
-        <alias field="amortized" name="" index="59"/>
-        <alias field="pending" name="" index="60"/>
+        <alias field="builtcost" name="" index="55"/>
+        <alias field="builtdate" name="" index="56"/>
+        <alias field="age" name="" index="57"/>
+        <alias field="acoeff" name="" index="58"/>
+        <alias field="aperiod" name="" index="59"/>
+        <alias field="arate" name="" index="60"/>
+        <alias field="amortized" name="" index="61"/>
+        <alias field="pending" name="" index="62"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="y1" applyOnUpdate="0" expression=""/>
-        <default field="y2" applyOnUpdate="0" expression=""/>
-        <default field="mean_y" applyOnUpdate="0" expression=""/>
-        <default field="z1" applyOnUpdate="0" expression=""/>
-        <default field="z2" applyOnUpdate="0" expression=""/>
-        <default field="thickness" applyOnUpdate="0" expression=""/>
-        <default field="width" applyOnUpdate="0" expression=""/>
-        <default field="b" applyOnUpdate="0" expression=""/>
-        <default field="bulk" applyOnUpdate="0" expression=""/>
-        <default field="geom1" applyOnUpdate="0" expression=""/>
-        <default field="area" applyOnUpdate="0" expression=""/>
-        <default field="y_param" applyOnUpdate="0" expression=""/>
-        <default field="total_y" applyOnUpdate="0" expression=""/>
-        <default field="rec_y" applyOnUpdate="0" expression=""/>
-        <default field="geom1_ext" applyOnUpdate="0" expression=""/>
-        <default field="calculed_y" applyOnUpdate="0" expression=""/>
-        <default field="m3mlexc" applyOnUpdate="0" expression=""/>
-        <default field="m2mltrenchl" applyOnUpdate="0" expression=""/>
-        <default field="m2mlbottom" applyOnUpdate="0" expression=""/>
-        <default field="m2mlpav" applyOnUpdate="0" expression=""/>
-        <default field="m3mlprotec" applyOnUpdate="0" expression=""/>
-        <default field="m3mlfill" applyOnUpdate="0" expression=""/>
-        <default field="m3mlexcess" applyOnUpdate="0" expression=""/>
-        <default field="m3exc_cost" applyOnUpdate="0" expression=""/>
-        <default field="m2trenchl_cost" applyOnUpdate="0" expression=""/>
-        <default field="m2bottom_cost" applyOnUpdate="0" expression=""/>
-        <default field="m2pav_cost" applyOnUpdate="0" expression=""/>
-        <default field="m3protec_cost" applyOnUpdate="0" expression=""/>
-        <default field="m3fill_cost" applyOnUpdate="0" expression=""/>
-        <default field="m3excess_cost" applyOnUpdate="0" expression=""/>
-        <default field="cost_unit" applyOnUpdate="0" expression=""/>
-        <default field="pav_cost" applyOnUpdate="0" expression=""/>
-        <default field="exc_cost" applyOnUpdate="0" expression=""/>
-        <default field="trenchl_cost" applyOnUpdate="0" expression=""/>
-        <default field="base_cost" applyOnUpdate="0" expression=""/>
-        <default field="protec_cost" applyOnUpdate="0" expression=""/>
-        <default field="fill_cost" applyOnUpdate="0" expression=""/>
-        <default field="excess_cost" applyOnUpdate="0" expression=""/>
-        <default field="arc_cost" applyOnUpdate="0" expression=""/>
-        <default field="cost" applyOnUpdate="0" expression=""/>
-        <default field="length" applyOnUpdate="0" expression=""/>
-        <default field="budget" applyOnUpdate="0" expression=""/>
-        <default field="other_budget" applyOnUpdate="0" expression=""/>
-        <default field="total_budget" applyOnUpdate="0" expression=""/>
-        <default field="age" applyOnUpdate="0" expression=""/>
-        <default field="acoeff" applyOnUpdate="0" expression=""/>
-        <default field="aperiod" applyOnUpdate="0" expression=""/>
-        <default field="arate" applyOnUpdate="0" expression=""/>
-        <default field="amortized" applyOnUpdate="0" expression=""/>
-        <default field="pending" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="y1" expression=""/>
+        <default applyOnUpdate="0" field="y2" expression=""/>
+        <default applyOnUpdate="0" field="mean_y" expression=""/>
+        <default applyOnUpdate="0" field="z1" expression=""/>
+        <default applyOnUpdate="0" field="z2" expression=""/>
+        <default applyOnUpdate="0" field="thickness" expression=""/>
+        <default applyOnUpdate="0" field="width" expression=""/>
+        <default applyOnUpdate="0" field="b" expression=""/>
+        <default applyOnUpdate="0" field="bulk" expression=""/>
+        <default applyOnUpdate="0" field="geom1" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="y_param" expression=""/>
+        <default applyOnUpdate="0" field="total_y" expression=""/>
+        <default applyOnUpdate="0" field="rec_y" expression=""/>
+        <default applyOnUpdate="0" field="geom1_ext" expression=""/>
+        <default applyOnUpdate="0" field="calculed_y" expression=""/>
+        <default applyOnUpdate="0" field="m3mlexc" expression=""/>
+        <default applyOnUpdate="0" field="m2mltrenchl" expression=""/>
+        <default applyOnUpdate="0" field="m2mlbottom" expression=""/>
+        <default applyOnUpdate="0" field="m2mlpav" expression=""/>
+        <default applyOnUpdate="0" field="m3mlprotec" expression=""/>
+        <default applyOnUpdate="0" field="m3mlfill" expression=""/>
+        <default applyOnUpdate="0" field="m3mlexcess" expression=""/>
+        <default applyOnUpdate="0" field="m3exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2trenchl_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2bottom_cost" expression=""/>
+        <default applyOnUpdate="0" field="m2pav_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="m3excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="pav_cost" expression=""/>
+        <default applyOnUpdate="0" field="exc_cost" expression=""/>
+        <default applyOnUpdate="0" field="trenchl_cost" expression=""/>
+        <default applyOnUpdate="0" field="base_cost" expression=""/>
+        <default applyOnUpdate="0" field="protec_cost" expression=""/>
+        <default applyOnUpdate="0" field="fill_cost" expression=""/>
+        <default applyOnUpdate="0" field="excess_cost" expression=""/>
+        <default applyOnUpdate="0" field="arc_cost" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="length" expression=""/>
+        <default applyOnUpdate="0" field="budget" expression=""/>
+        <default applyOnUpdate="0" field="other_budget" expression=""/>
+        <default applyOnUpdate="0" field="total_budget" expression=""/>
+        <default applyOnUpdate="0" field="builtcost" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="age" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
+        <default applyOnUpdate="0" field="aperiod" expression=""/>
+        <default applyOnUpdate="0" field="arate" expression=""/>
+        <default applyOnUpdate="0" field="amortized" expression=""/>
+        <default applyOnUpdate="0" field="pending" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="mean_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="z1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="z2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="thickness" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="width" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="b" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="bulk" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="geom1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="area" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_param" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="total_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rec_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="geom1_ext" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="calculed_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3mlexc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m2mltrenchl" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m2mlbottom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m2mlpav" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3mlprotec" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3mlfill" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3mlexcess" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3exc_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m2trenchl_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m2bottom_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m2pav_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3protec_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3fill_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="m3excess_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost_unit" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pav_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exc_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="trenchl_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="base_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="protec_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fill_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="excess_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="budget" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="other_budget" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="total_budget" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="age" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="acoeff" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="aperiod" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="amortized" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pending" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mean_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="z2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="thickness" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="width" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="b" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="bulk" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="area" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_param" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rec_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="geom1_ext" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="calculed_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlexc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mltrenchl" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mlbottom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2mlpav" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlprotec" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlfill" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3mlexcess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2trenchl_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2bottom_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m2pav_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="m3excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pav_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="trenchl_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="base_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="protec_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fill_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="excess_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="other_budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="total_budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtcost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="aperiod" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="amortized" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pending" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="y1" desc="" exp=""/>
-        <constraint field="y2" desc="" exp=""/>
-        <constraint field="mean_y" desc="" exp=""/>
-        <constraint field="z1" desc="" exp=""/>
-        <constraint field="z2" desc="" exp=""/>
-        <constraint field="thickness" desc="" exp=""/>
-        <constraint field="width" desc="" exp=""/>
-        <constraint field="b" desc="" exp=""/>
-        <constraint field="bulk" desc="" exp=""/>
-        <constraint field="geom1" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="y_param" desc="" exp=""/>
-        <constraint field="total_y" desc="" exp=""/>
-        <constraint field="rec_y" desc="" exp=""/>
-        <constraint field="geom1_ext" desc="" exp=""/>
-        <constraint field="calculed_y" desc="" exp=""/>
-        <constraint field="m3mlexc" desc="" exp=""/>
-        <constraint field="m2mltrenchl" desc="" exp=""/>
-        <constraint field="m2mlbottom" desc="" exp=""/>
-        <constraint field="m2mlpav" desc="" exp=""/>
-        <constraint field="m3mlprotec" desc="" exp=""/>
-        <constraint field="m3mlfill" desc="" exp=""/>
-        <constraint field="m3mlexcess" desc="" exp=""/>
-        <constraint field="m3exc_cost" desc="" exp=""/>
-        <constraint field="m2trenchl_cost" desc="" exp=""/>
-        <constraint field="m2bottom_cost" desc="" exp=""/>
-        <constraint field="m2pav_cost" desc="" exp=""/>
-        <constraint field="m3protec_cost" desc="" exp=""/>
-        <constraint field="m3fill_cost" desc="" exp=""/>
-        <constraint field="m3excess_cost" desc="" exp=""/>
-        <constraint field="cost_unit" desc="" exp=""/>
-        <constraint field="pav_cost" desc="" exp=""/>
-        <constraint field="exc_cost" desc="" exp=""/>
-        <constraint field="trenchl_cost" desc="" exp=""/>
-        <constraint field="base_cost" desc="" exp=""/>
-        <constraint field="protec_cost" desc="" exp=""/>
-        <constraint field="fill_cost" desc="" exp=""/>
-        <constraint field="excess_cost" desc="" exp=""/>
-        <constraint field="arc_cost" desc="" exp=""/>
-        <constraint field="cost" desc="" exp=""/>
-        <constraint field="length" desc="" exp=""/>
-        <constraint field="budget" desc="" exp=""/>
-        <constraint field="other_budget" desc="" exp=""/>
-        <constraint field="total_budget" desc="" exp=""/>
-        <constraint field="age" desc="" exp=""/>
-        <constraint field="acoeff" desc="" exp=""/>
-        <constraint field="aperiod" desc="" exp=""/>
-        <constraint field="arate" desc="" exp=""/>
-        <constraint field="amortized" desc="" exp=""/>
-        <constraint field="pending" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="y1" desc=""/>
+        <constraint exp="" field="y2" desc=""/>
+        <constraint exp="" field="mean_y" desc=""/>
+        <constraint exp="" field="z1" desc=""/>
+        <constraint exp="" field="z2" desc=""/>
+        <constraint exp="" field="thickness" desc=""/>
+        <constraint exp="" field="width" desc=""/>
+        <constraint exp="" field="b" desc=""/>
+        <constraint exp="" field="bulk" desc=""/>
+        <constraint exp="" field="geom1" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="y_param" desc=""/>
+        <constraint exp="" field="total_y" desc=""/>
+        <constraint exp="" field="rec_y" desc=""/>
+        <constraint exp="" field="geom1_ext" desc=""/>
+        <constraint exp="" field="calculed_y" desc=""/>
+        <constraint exp="" field="m3mlexc" desc=""/>
+        <constraint exp="" field="m2mltrenchl" desc=""/>
+        <constraint exp="" field="m2mlbottom" desc=""/>
+        <constraint exp="" field="m2mlpav" desc=""/>
+        <constraint exp="" field="m3mlprotec" desc=""/>
+        <constraint exp="" field="m3mlfill" desc=""/>
+        <constraint exp="" field="m3mlexcess" desc=""/>
+        <constraint exp="" field="m3exc_cost" desc=""/>
+        <constraint exp="" field="m2trenchl_cost" desc=""/>
+        <constraint exp="" field="m2bottom_cost" desc=""/>
+        <constraint exp="" field="m2pav_cost" desc=""/>
+        <constraint exp="" field="m3protec_cost" desc=""/>
+        <constraint exp="" field="m3fill_cost" desc=""/>
+        <constraint exp="" field="m3excess_cost" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="pav_cost" desc=""/>
+        <constraint exp="" field="exc_cost" desc=""/>
+        <constraint exp="" field="trenchl_cost" desc=""/>
+        <constraint exp="" field="base_cost" desc=""/>
+        <constraint exp="" field="protec_cost" desc=""/>
+        <constraint exp="" field="fill_cost" desc=""/>
+        <constraint exp="" field="excess_cost" desc=""/>
+        <constraint exp="" field="arc_cost" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="length" desc=""/>
+        <constraint exp="" field="budget" desc=""/>
+        <constraint exp="" field="other_budget" desc=""/>
+        <constraint exp="" field="total_budget" desc=""/>
+        <constraint exp="" field="builtcost" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="age" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
+        <constraint exp="" field="aperiod" desc=""/>
+        <constraint exp="" field="arate" desc=""/>
+        <constraint exp="" field="amortized" desc=""/>
+        <constraint exp="" field="pending" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="node_1" hidden="0" width="-1" type="field"/>
-          <column name="node_2" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="y1" hidden="0" width="-1" type="field"/>
-          <column name="y2" hidden="0" width="-1" type="field"/>
-          <column name="mean_y" hidden="0" width="-1" type="field"/>
-          <column name="z1" hidden="0" width="-1" type="field"/>
-          <column name="z2" hidden="0" width="-1" type="field"/>
-          <column name="thickness" hidden="0" width="-1" type="field"/>
-          <column name="width" hidden="0" width="-1" type="field"/>
-          <column name="b" hidden="0" width="-1" type="field"/>
-          <column name="bulk" hidden="0" width="-1" type="field"/>
-          <column name="geom1" hidden="0" width="-1" type="field"/>
-          <column name="area" hidden="0" width="-1" type="field"/>
-          <column name="y_param" hidden="0" width="-1" type="field"/>
-          <column name="total_y" hidden="0" width="-1" type="field"/>
-          <column name="rec_y" hidden="0" width="-1" type="field"/>
-          <column name="geom1_ext" hidden="0" width="-1" type="field"/>
-          <column name="calculed_y" hidden="0" width="-1" type="field"/>
-          <column name="m3mlexc" hidden="0" width="-1" type="field"/>
-          <column name="m2mltrenchl" hidden="0" width="-1" type="field"/>
-          <column name="m2mlbottom" hidden="0" width="-1" type="field"/>
-          <column name="m2mlpav" hidden="0" width="-1" type="field"/>
-          <column name="m3mlprotec" hidden="0" width="-1" type="field"/>
-          <column name="m3mlfill" hidden="0" width="-1" type="field"/>
-          <column name="m3mlexcess" hidden="0" width="-1" type="field"/>
-          <column name="m3exc_cost" hidden="0" width="-1" type="field"/>
-          <column name="m2trenchl_cost" hidden="0" width="-1" type="field"/>
-          <column name="m2bottom_cost" hidden="0" width="-1" type="field"/>
-          <column name="m2pav_cost" hidden="0" width="-1" type="field"/>
-          <column name="m3protec_cost" hidden="0" width="-1" type="field"/>
-          <column name="m3fill_cost" hidden="0" width="-1" type="field"/>
-          <column name="m3excess_cost" hidden="0" width="-1" type="field"/>
-          <column name="cost_unit" hidden="0" width="-1" type="field"/>
-          <column name="pav_cost" hidden="0" width="-1" type="field"/>
-          <column name="exc_cost" hidden="0" width="-1" type="field"/>
-          <column name="trenchl_cost" hidden="0" width="-1" type="field"/>
-          <column name="base_cost" hidden="0" width="-1" type="field"/>
-          <column name="protec_cost" hidden="0" width="-1" type="field"/>
-          <column name="fill_cost" hidden="0" width="-1" type="field"/>
-          <column name="excess_cost" hidden="0" width="-1" type="field"/>
-          <column name="arc_cost" hidden="0" width="-1" type="field"/>
-          <column name="cost" hidden="0" width="-1" type="field"/>
-          <column name="length" hidden="0" width="-1" type="field"/>
-          <column name="bSCHEMA_NAMEget" hidden="0" width="-1" type="field"/>
-          <column name="other_bSCHEMA_NAMEget" hidden="0" width="-1" type="field"/>
-          <column name="total_bSCHEMA_NAMEget" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="y1"/>
+          <column type="field" width="-1" hidden="0" name="y2"/>
+          <column type="field" width="-1" hidden="0" name="mean_y"/>
+          <column type="field" width="-1" hidden="0" name="z1"/>
+          <column type="field" width="-1" hidden="0" name="z2"/>
+          <column type="field" width="-1" hidden="0" name="thickness"/>
+          <column type="field" width="-1" hidden="0" name="width"/>
+          <column type="field" width="-1" hidden="0" name="b"/>
+          <column type="field" width="-1" hidden="0" name="bulk"/>
+          <column type="field" width="-1" hidden="0" name="geom1"/>
+          <column type="field" width="-1" hidden="0" name="area"/>
+          <column type="field" width="-1" hidden="0" name="y_param"/>
+          <column type="field" width="-1" hidden="0" name="total_y"/>
+          <column type="field" width="-1" hidden="0" name="rec_y"/>
+          <column type="field" width="-1" hidden="0" name="geom1_ext"/>
+          <column type="field" width="-1" hidden="0" name="calculed_y"/>
+          <column type="field" width="-1" hidden="0" name="m3mlexc"/>
+          <column type="field" width="-1" hidden="0" name="m2mltrenchl"/>
+          <column type="field" width="-1" hidden="0" name="m2mlbottom"/>
+          <column type="field" width="-1" hidden="0" name="m2mlpav"/>
+          <column type="field" width="-1" hidden="0" name="m3mlprotec"/>
+          <column type="field" width="-1" hidden="0" name="m3mlfill"/>
+          <column type="field" width="-1" hidden="0" name="m3mlexcess"/>
+          <column type="field" width="-1" hidden="0" name="m3exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2trenchl_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2bottom_cost"/>
+          <column type="field" width="-1" hidden="0" name="m2pav_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="m3excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="pav_cost"/>
+          <column type="field" width="-1" hidden="0" name="exc_cost"/>
+          <column type="field" width="-1" hidden="0" name="trenchl_cost"/>
+          <column type="field" width="-1" hidden="0" name="base_cost"/>
+          <column type="field" width="-1" hidden="0" name="protec_cost"/>
+          <column type="field" width="-1" hidden="0" name="fill_cost"/>
+          <column type="field" width="-1" hidden="0" name="excess_cost"/>
+          <column type="field" width="-1" hidden="0" name="arc_cost"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="length"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="budget"/>
+          <column type="field" width="-1" hidden="0" name="other_budget"/>
+          <column type="field" width="-1" hidden="0" name="total_budget"/>
+          <column type="field" width="-1" hidden="0" name="builtcost"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="age"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
+          <column type="field" width="-1" hidden="0" name="aperiod"/>
+          <column type="field" width="-1" hidden="0" name="arate"/>
+          <column type="field" width="-1" hidden="0" name="amortized"/>
+          <column type="field" width="-1" hidden="0" name="pending"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25569,67 +26208,80 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="annotation"/>
-        <field editable="0" name="arc_cost"/>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="arc_type"/>
-        <field editable="0" name="arccat_id"/>
-        <field editable="0" name="area"/>
-        <field editable="0" name="b"/>
-        <field editable="0" name="base_cost"/>
-        <field editable="0" name="budget"/>
-        <field editable="0" name="bulk"/>
-        <field editable="0" name="bSCHEMA_NAMEget"/>
-        <field editable="0" name="calculed_y"/>
-        <field editable="0" name="cost"/>
-        <field editable="0" name="cost_unit"/>
-        <field editable="0" name="epa_type"/>
-        <field editable="0" name="exc_cost"/>
-        <field editable="0" name="excess_cost"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="fill_cost"/>
-        <field editable="0" name="geom1"/>
-        <field editable="0" name="geom1_ext"/>
-        <field editable="0" name="length"/>
-        <field editable="0" name="m2bottom_cost"/>
-        <field editable="0" name="m2mlbottom"/>
-        <field editable="0" name="m2mlpav"/>
-        <field editable="0" name="m2mltrenchl"/>
-        <field editable="0" name="m2pav_cost"/>
-        <field editable="0" name="m2trenchl_cost"/>
-        <field editable="0" name="m3exc_cost"/>
-        <field editable="0" name="m3excess_cost"/>
-        <field editable="0" name="m3fill_cost"/>
-        <field editable="0" name="m3mlexc"/>
-        <field editable="0" name="m3mlexcess"/>
-        <field editable="0" name="m3mlfill"/>
-        <field editable="0" name="m3mlprotec"/>
-        <field editable="0" name="m3protec_cost"/>
-        <field editable="0" name="mean_y"/>
-        <field editable="0" name="node_1"/>
-        <field editable="0" name="node_2"/>
-        <field editable="0" name="other_budget"/>
-        <field editable="0" name="other_bSCHEMA_NAMEget"/>
-        <field editable="0" name="pav_cost"/>
-        <field editable="0" name="protec_cost"/>
-        <field editable="0" name="rec_y"/>
-        <field editable="0" name="sector_id"/>
-        <field editable="0" name="soilcat_id"/>
-        <field editable="0" name="state"/>
-        <field editable="0" name="thickness"/>
-        <field editable="0" name="total_budget"/>
-        <field editable="0" name="total_bSCHEMA_NAMEget"/>
-        <field editable="0" name="total_y"/>
-        <field editable="0" name="trenchl_cost"/>
-        <field editable="0" name="width"/>
-        <field editable="0" name="y1"/>
-        <field editable="0" name="y2"/>
-        <field editable="0" name="y_param"/>
-        <field editable="0" name="z1"/>
-        <field editable="0" name="z2"/>
+        <field name="acoeff" editable="1"/>
+        <field name="age" editable="1"/>
+        <field name="amortized" editable="1"/>
+        <field name="annotation" editable="0"/>
+        <field name="aperiod" editable="1"/>
+        <field name="arate" editable="1"/>
+        <field name="arc_cost" editable="0"/>
+        <field name="arc_id" editable="0"/>
+        <field name="arc_type" editable="0"/>
+        <field name="arccat_id" editable="0"/>
+        <field name="area" editable="0"/>
+        <field name="b" editable="0"/>
+        <field name="base_cost" editable="0"/>
+        <field name="budget" editable="0"/>
+        <field name="builtcost" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="bulk" editable="0"/>
+        <field name="bSCHEMA_NAMEget" editable="0"/>
+        <field name="calculed_y" editable="0"/>
+        <field name="cost" editable="0"/>
+        <field name="cost_unit" editable="0"/>
+        <field name="epa_type" editable="0"/>
+        <field name="exc_cost" editable="0"/>
+        <field name="excess_cost" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="fill_cost" editable="0"/>
+        <field name="geom1" editable="0"/>
+        <field name="geom1_ext" editable="0"/>
+        <field name="length" editable="0"/>
+        <field name="m2bottom_cost" editable="0"/>
+        <field name="m2mlbottom" editable="0"/>
+        <field name="m2mlpav" editable="0"/>
+        <field name="m2mltrenchl" editable="0"/>
+        <field name="m2pav_cost" editable="0"/>
+        <field name="m2trenchl_cost" editable="0"/>
+        <field name="m3exc_cost" editable="0"/>
+        <field name="m3excess_cost" editable="0"/>
+        <field name="m3fill_cost" editable="0"/>
+        <field name="m3mlexc" editable="0"/>
+        <field name="m3mlexcess" editable="0"/>
+        <field name="m3mlfill" editable="0"/>
+        <field name="m3mlprotec" editable="0"/>
+        <field name="m3protec_cost" editable="0"/>
+        <field name="mean_y" editable="0"/>
+        <field name="node_1" editable="0"/>
+        <field name="node_2" editable="0"/>
+        <field name="other_budget" editable="0"/>
+        <field name="other_bSCHEMA_NAMEget" editable="0"/>
+        <field name="pav_cost" editable="0"/>
+        <field name="pending" editable="1"/>
+        <field name="protec_cost" editable="0"/>
+        <field name="rec_y" editable="0"/>
+        <field name="sector_id" editable="0"/>
+        <field name="soilcat_id" editable="0"/>
+        <field name="state" editable="0"/>
+        <field name="thickness" editable="0"/>
+        <field name="total_budget" editable="0"/>
+        <field name="total_bSCHEMA_NAMEget" editable="0"/>
+        <field name="total_y" editable="0"/>
+        <field name="trenchl_cost" editable="0"/>
+        <field name="width" editable="0"/>
+        <field name="y1" editable="0"/>
+        <field name="y2" editable="0"/>
+        <field name="y_param" editable="0"/>
+        <field name="z1" editable="0"/>
+        <field name="z2" editable="0"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
+        <field labelOnTop="0" name="age"/>
+        <field labelOnTop="0" name="amortized"/>
         <field labelOnTop="0" name="annotation"/>
+        <field labelOnTop="0" name="aperiod"/>
+        <field labelOnTop="0" name="arate"/>
         <field labelOnTop="0" name="arc_cost"/>
         <field labelOnTop="0" name="arc_id"/>
         <field labelOnTop="0" name="arc_type"/>
@@ -25637,6 +26289,9 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="area"/>
         <field labelOnTop="0" name="b"/>
         <field labelOnTop="0" name="base_cost"/>
+        <field labelOnTop="0" name="budget"/>
+        <field labelOnTop="0" name="builtcost"/>
+        <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="bulk"/>
         <field labelOnTop="0" name="bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="calculed_y"/>
@@ -25667,14 +26322,17 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="mean_y"/>
         <field labelOnTop="0" name="node_1"/>
         <field labelOnTop="0" name="node_2"/>
+        <field labelOnTop="0" name="other_budget"/>
         <field labelOnTop="0" name="other_bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="pav_cost"/>
+        <field labelOnTop="0" name="pending"/>
         <field labelOnTop="0" name="protec_cost"/>
         <field labelOnTop="0" name="rec_y"/>
         <field labelOnTop="0" name="sector_id"/>
         <field labelOnTop="0" name="soilcat_id"/>
         <field labelOnTop="0" name="state"/>
         <field labelOnTop="0" name="thickness"/>
+        <field labelOnTop="0" name="total_budget"/>
         <field labelOnTop="0" name="total_bSCHEMA_NAMEget"/>
         <field labelOnTop="0" name="total_y"/>
         <field labelOnTop="0" name="trenchl_cost"/>
@@ -25689,7 +26347,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="100000" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -25722,6 +26380,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -25738,7 +26405,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -25755,33 +26430,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25790,32 +26465,36 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25824,8 +26503,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25834,8 +26513,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25844,8 +26523,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25854,8 +26533,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25864,8 +26543,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25874,50 +26553,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25926,8 +26593,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25936,8 +26603,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25946,8 +26613,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -25956,58 +26623,102 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="budget">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="builtcost">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="builtdate">
+          <editWidget type="DateTime">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="age">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="acoeff">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="aperiod">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="arate">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="amortized">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="pending">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -26027,101 +26738,118 @@ def my_form_open(dialog, layer, feature):
         <alias field="measurement" name="measurement" index="11"/>
         <alias field="cost" name="cost" index="12"/>
         <alias field="budget" name="budget" index="13"/>
-        <alias field="age" name="" index="14"/>
-        <alias field="acoeff" name="" index="15"/>
-        <alias field="aperiod" name="" index="16"/>
-        <alias field="arate" name="" index="17"/>
-        <alias field="amortized" name="" index="18"/>
-        <alias field="pending" name="" index="19"/>
+        <alias field="builtcost" name="" index="14"/>
+        <alias field="builtdate" name="" index="15"/>
+        <alias field="age" name="" index="16"/>
+        <alias field="acoeff" name="" index="17"/>
+        <alias field="aperiod" name="" index="18"/>
+        <alias field="arate" name="" index="19"/>
+        <alias field="amortized" name="" index="20"/>
+        <alias field="pending" name="" index="21"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="top_elev" applyOnUpdate="0" expression=""/>
-        <default field="elev" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="cost_unit" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="measurement" applyOnUpdate="0" expression=""/>
-        <default field="cost" applyOnUpdate="0" expression=""/>
-        <default field="budget" applyOnUpdate="0" expression=""/>
-        <default field="age" applyOnUpdate="0" expression=""/>
-        <default field="acoeff" applyOnUpdate="0" expression=""/>
-        <default field="aperiod" applyOnUpdate="0" expression=""/>
-        <default field="arate" applyOnUpdate="0" expression=""/>
-        <default field="amortized" applyOnUpdate="0" expression=""/>
-        <default field="pending" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="top_elev" expression=""/>
+        <default applyOnUpdate="0" field="elev" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="cost_unit" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="measurement" expression=""/>
+        <default applyOnUpdate="0" field="cost" expression=""/>
+        <default applyOnUpdate="0" field="budget" expression=""/>
+        <default applyOnUpdate="0" field="builtcost" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="age" expression=""/>
+        <default applyOnUpdate="0" field="acoeff" expression=""/>
+        <default applyOnUpdate="0" field="aperiod" expression=""/>
+        <default applyOnUpdate="0" field="arate" expression=""/>
+        <default applyOnUpdate="0" field="amortized" expression=""/>
+        <default applyOnUpdate="0" field="pending" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="top_elev" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elev" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost_unit" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="measurement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="budget" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="age" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="acoeff" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="aperiod" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="amortized" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pending" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="top_elev" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elev" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_unit" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="measurement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="budget" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtcost" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="age" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="acoeff" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="aperiod" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="amortized" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pending" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="top_elev" desc="" exp=""/>
-        <constraint field="elev" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="cost_unit" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="measurement" desc="" exp=""/>
-        <constraint field="cost" desc="" exp=""/>
-        <constraint field="budget" desc="" exp=""/>
-        <constraint field="age" desc="" exp=""/>
-        <constraint field="acoeff" desc="" exp=""/>
-        <constraint field="aperiod" desc="" exp=""/>
-        <constraint field="arate" desc="" exp=""/>
-        <constraint field="amortized" desc="" exp=""/>
-        <constraint field="pending" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="top_elev" desc=""/>
+        <constraint exp="" field="elev" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="cost_unit" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="measurement" desc=""/>
+        <constraint exp="" field="cost" desc=""/>
+        <constraint exp="" field="budget" desc=""/>
+        <constraint exp="" field="builtcost" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="age" desc=""/>
+        <constraint exp="" field="acoeff" desc=""/>
+        <constraint exp="" field="aperiod" desc=""/>
+        <constraint exp="" field="arate" desc=""/>
+        <constraint exp="" field="amortized" desc=""/>
+        <constraint exp="" field="pending" desc=""/>
       </constraintExpressions>
       <expressionfields/>
-      <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="nodecat_id" hidden="0" width="-1" type="field"/>
-          <column name="node_type" hidden="0" width="-1" type="field"/>
-          <column name="top_elev" hidden="0" width="-1" type="field"/>
-          <column name="elev" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="cost_unit" hidden="0" width="122" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="calculated_depth" hidden="0" width="-1" type="field"/>
-          <column name="cost" hidden="0" width="-1" type="field"/>
-          <column name="bSCHEMA_NAMEget" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="top_elev"/>
+          <column type="field" width="-1" hidden="0" name="elev"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="122" hidden="0" name="cost_unit"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="cost"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="measurement"/>
+          <column type="field" width="-1" hidden="0" name="budget"/>
+          <column type="field" width="-1" hidden="0" name="builtcost"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="age"/>
+          <column type="field" width="-1" hidden="0" name="acoeff"/>
+          <column type="field" width="-1" hidden="0" name="aperiod"/>
+          <column type="field" width="-1" hidden="0" name="arate"/>
+          <column type="field" width="-1" hidden="0" name="amortized"/>
+          <column type="field" width="-1" hidden="0" name="pending"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26153,28 +26881,59 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="budget"/>
-        <field editable="0" name="bSCHEMA_NAMEget"/>
-        <field editable="0" name="cost"/>
-        <field editable="0" name="cost_unit"/>
-        <field editable="0" name="descript"/>
-        <field editable="0" name="elev"/>
-        <field editable="0" name="epa_type"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="measurement"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="sector_id"/>
-        <field editable="0" name="state"/>
-        <field editable="0" name="top_elev"/>
+        <field name="acoeff" editable="1"/>
+        <field name="age" editable="1"/>
+        <field name="amortized" editable="1"/>
+        <field name="aperiod" editable="1"/>
+        <field name="arate" editable="1"/>
+        <field name="budget" editable="0"/>
+        <field name="builtcost" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="bSCHEMA_NAMEget" editable="0"/>
+        <field name="cost" editable="0"/>
+        <field name="cost_unit" editable="0"/>
+        <field name="descript" editable="0"/>
+        <field name="elev" editable="0"/>
+        <field name="epa_type" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="measurement" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="pending" editable="1"/>
+        <field name="sector_id" editable="0"/>
+        <field name="state" editable="0"/>
+        <field name="top_elev" editable="0"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="acoeff"/>
+        <field labelOnTop="0" name="age"/>
+        <field labelOnTop="0" name="amortized"/>
+        <field labelOnTop="0" name="aperiod"/>
+        <field labelOnTop="0" name="arate"/>
+        <field labelOnTop="0" name="budget"/>
+        <field labelOnTop="0" name="builtcost"/>
+        <field labelOnTop="0" name="builtdate"/>
+        <field labelOnTop="0" name="cost"/>
+        <field labelOnTop="0" name="cost_unit"/>
+        <field labelOnTop="0" name="descript"/>
+        <field labelOnTop="0" name="elev"/>
+        <field labelOnTop="0" name="epa_type"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="measurement"/>
+        <field labelOnTop="0" name="node_id"/>
+        <field labelOnTop="0" name="node_type"/>
+        <field labelOnTop="0" name="nodecat_id"/>
+        <field labelOnTop="0" name="pending"/>
+        <field labelOnTop="0" name="sector_id"/>
+        <field labelOnTop="0" name="state"/>
+        <field labelOnTop="0" name="top_elev"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("descript", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc20180206173632206</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc" (the_geom) sql=</datasource>
       <keywordList>
@@ -26234,162 +26993,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -26397,49 +27156,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -26452,27 +27211,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="arc_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26481,8 +27240,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -26630,94 +27389,94 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="max_flow" applyOnUpdate="0" expression=""/>
-        <default field="min_flow" applyOnUpdate="0" expression=""/>
-        <default field="max_vel" applyOnUpdate="0" expression=""/>
-        <default field="min_vel" applyOnUpdate="0" expression=""/>
-        <default field="max_headloss" applyOnUpdate="0" expression=""/>
-        <default field="min_headloss" applyOnUpdate="0" expression=""/>
-        <default field="max_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="min_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="max_setting" applyOnUpdate="0" expression=""/>
-        <default field="min_setting" applyOnUpdate="0" expression=""/>
-        <default field="max_reaction" applyOnUpdate="0" expression=""/>
-        <default field="min_reaction" applyOnUpdate="0" expression=""/>
-        <default field="max_ffactor" applyOnUpdate="0" expression=""/>
-        <default field="min_ffactor" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="max_flow" desc="" exp=""/>
-        <constraint field="min_flow" desc="" exp=""/>
-        <constraint field="max_vel" desc="" exp=""/>
-        <constraint field="min_vel" desc="" exp=""/>
-        <constraint field="max_headloss" desc="" exp=""/>
-        <constraint field="min_headloss" desc="" exp=""/>
-        <constraint field="max_uheadloss" desc="" exp=""/>
-        <constraint field="min_uheadloss" desc="" exp=""/>
-        <constraint field="max_setting" desc="" exp=""/>
-        <constraint field="min_setting" desc="" exp=""/>
-        <constraint field="max_reaction" desc="" exp=""/>
-        <constraint field="min_reaction" desc="" exp=""/>
-        <constraint field="max_ffactor" desc="" exp=""/>
-        <constraint field="min_ffactor" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{60d6ccd0-15e7-4202-a632-f4fe687bfb40}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="max_flow" hidden="0" width="-1" type="field"/>
-          <column name="min_flow" hidden="0" width="-1" type="field"/>
-          <column name="max_vel" hidden="0" width="-1" type="field"/>
-          <column name="min_vel" hidden="0" width="-1" type="field"/>
-          <column name="max_headloss" hidden="0" width="-1" type="field"/>
-          <column name="min_headloss" hidden="0" width="-1" type="field"/>
-          <column name="max_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="min_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="max_setting" hidden="0" width="-1" type="field"/>
-          <column name="min_setting" hidden="0" width="-1" type="field"/>
-          <column name="max_reaction" hidden="0" width="-1" type="field"/>
-          <column name="min_reaction" hidden="0" width="-1" type="field"/>
-          <column name="max_ffactor" hidden="0" width="-1" type="field"/>
-          <column name="min_ffactor" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26749,31 +27508,31 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="arc_type"/>
-        <field editable="0" name="arccat_id"/>
-        <field editable="0" name="max_ffactor"/>
-        <field editable="0" name="max_flow"/>
-        <field editable="0" name="max_headloss"/>
-        <field editable="0" name="max_reaction"/>
-        <field editable="0" name="max_setting"/>
-        <field editable="0" name="max_uheadloss"/>
-        <field editable="0" name="max_vel"/>
-        <field editable="0" name="min_ffactor"/>
-        <field editable="0" name="min_flow"/>
-        <field editable="0" name="min_headloss"/>
-        <field editable="0" name="min_reaction"/>
-        <field editable="0" name="min_setting"/>
-        <field editable="0" name="min_uheadloss"/>
-        <field editable="0" name="min_vel"/>
-        <field editable="0" name="result_id"/>
+        <field name="arc_id" editable="0"/>
+        <field name="arc_type" editable="0"/>
+        <field name="arccat_id" editable="0"/>
+        <field name="max_ffactor" editable="0"/>
+        <field name="max_flow" editable="0"/>
+        <field name="max_headloss" editable="0"/>
+        <field name="max_reaction" editable="0"/>
+        <field name="max_setting" editable="0"/>
+        <field name="max_uheadloss" editable="0"/>
+        <field name="max_vel" editable="0"/>
+        <field name="min_ffactor" editable="0"/>
+        <field name="min_flow" editable="0"/>
+        <field name="min_headloss" editable="0"/>
+        <field name="min_reaction" editable="0"/>
+        <field name="min_setting" editable="0"/>
+        <field name="min_uheadloss" editable="0"/>
+        <field name="min_vel" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_all20180309112714512</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -26833,31 +27592,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="20,173,40,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="20,173,40,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26870,7 +27629,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26886,8 +27645,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -26972,60 +27731,60 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="vel" applyOnUpdate="0" expression=""/>
-        <default field="headloss" applyOnUpdate="0" expression=""/>
-        <default field="setting" applyOnUpdate="0" expression=""/>
-        <default field="ffactor" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="vel" desc="" exp=""/>
-        <constraint field="headloss" desc="" exp=""/>
-        <constraint field="setting" desc="" exp=""/>
-        <constraint field="ffactor" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="flow" hidden="0" width="-1" type="field"/>
-          <column name="vel" hidden="0" width="-1" type="field"/>
-          <column name="headloss" hidden="0" width="-1" type="field"/>
-          <column name="setting" hidden="0" width="-1" type="field"/>
-          <column name="ffactor" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27041,24 +27800,24 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="arc_type"/>
-        <field editable="0" name="arccat_id"/>
-        <field editable="0" name="ffactor"/>
-        <field editable="0" name="flow"/>
-        <field editable="0" name="headloss"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="setting"/>
-        <field editable="0" name="time"/>
-        <field editable="0" name="vel"/>
+        <field name="arc_id" editable="0"/>
+        <field name="arc_type" editable="0"/>
+        <field name="arccat_id" editable="0"/>
+        <field name="ffactor" editable="0"/>
+        <field name="flow" editable="0"/>
+        <field name="headloss" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="setting" editable="0"/>
+        <field name="time" editable="0"/>
+        <field name="vel" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_arc_hourly20180309112714378</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -27118,162 +27877,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -27281,49 +28040,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -27336,27 +28095,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27372,8 +28131,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -27442,58 +28201,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="vel" applyOnUpdate="0" expression=""/>
-        <default field="headloss" applyOnUpdate="0" expression=""/>
-        <default field="setting" applyOnUpdate="0" expression=""/>
-        <default field="ffactor" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="vel" desc="" exp=""/>
-        <constraint field="headloss" desc="" exp=""/>
-        <constraint field="setting" desc="" exp=""/>
-        <constraint field="ffactor" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{bc968d00-0198-4e46-9f58-2fe359b28284}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{bc968d00-0198-4e46-9f58-2fe359b28284}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="flow" hidden="0" width="-1" type="field"/>
-          <column name="vel" hidden="0" width="-1" type="field"/>
-          <column name="headloss" hidden="0" width="-1" type="field"/>
-          <column name="setting" hidden="0" width="-1" type="field"/>
-          <column name="ffactor" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27525,22 +28284,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="ffactor"/>
-        <field editable="0" name="flow"/>
-        <field editable="0" name="headloss"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="setting"/>
-        <field editable="0" name="time"/>
-        <field editable="0" name="vel"/>
+        <field name="arc_id" editable="0"/>
+        <field name="ffactor" editable="0"/>
+        <field name="flow" editable="0"/>
+        <field name="headloss" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="setting" editable="0"/>
+        <field name="time" editable="0"/>
+        <field name="vel" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc20160710012004554</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_arc</shortname>
@@ -27594,174 +28353,174 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <map-layer-style-manager current="arc maxheadloss">
         <map-layer-style name="% arc headloss">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_uheadloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_uheadloss" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.5 %" lower="0.000000000000000" upper="0.500000000000000" symbol="0"/>
-                <range render="true" label=" 0.5 - 1.0 %" lower="0.500000000000000" upper="1.000000000000000" symbol="1"/>
-                <range render="true" label=" 1.0 - 10.0 %" lower="1.000000000000000" upper="10.000000000000000" symbol="2"/>
-                <range render="true" label="> 10.0 %" lower="10.000000000000000" upper="100.000000000000000" symbol="3"/>
+                <range upper="0.500000000000000" render="true" lower="0.000000000000000" label="&lt; 0.5 %" symbol="0"/>
+                <range upper="1.000000000000000" render="true" lower="0.500000000000000" label=" 0.5 - 1.0 %" symbol="1"/>
+                <range upper="10.000000000000000" render="true" lower="1.000000000000000" label=" 1.0 - 10.0 %" symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="10.000000000000000" label="> 10.0 %" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="1" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="1" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -27914,34 +28673,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -27975,174 +28734,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="arc maxflow">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="-4.65661e-10" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_flow" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_flow" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.50 l/s" lower="-0.290000000000000" upper="0.500000000000000" symbol="0"/>
-                <range render="true" label="0.50 - 1.50 l/s" lower="0.500000000000000" upper="1.500000000000000" symbol="1"/>
-                <range render="true" label="1.50 - 2.50 l/s " lower="1.500000000000000" upper="2.500000000000000" symbol="2"/>
-                <range render="true" label="> 2.5 l/s" lower="2.500000000000000" upper="100.000000000000000" symbol="3"/>
+                <range upper="0.500000000000000" render="true" lower="-0.290000000000000" label="&lt; 0.50 l/s" symbol="0"/>
+                <range upper="1.500000000000000" render="true" lower="0.500000000000000" label="0.50 - 1.50 l/s" symbol="1"/>
+                <range upper="2.500000000000000" render="true" lower="1.500000000000000" label="1.50 - 2.50 l/s " symbol="2"/>
+                <range upper="100.000000000000000" render="true" lower="2.500000000000000" label="> 2.5 l/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="2" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -28295,34 +29054,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -28357,174 +29116,174 @@ def my_form_open(dialog, layer, feature):
         </map-layer-style>
         <map-layer-style name="arc maxheadloss"/>
         <map-layer-style name="arc maxvelocity">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_vel" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_vel" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.15 m/s" lower="0.000000000000000" upper="0.150000000000000" symbol="0"/>
-                <range render="true" label=" 0.15 - 0.30 m/s" lower="0.150000000000000" upper="0.300000000000000" symbol="1"/>
-                <range render="true" label=" 0.30 - 0.45 m/s " lower="0.300000000000000" upper="0.450000000000000" symbol="2"/>
-                <range render="true" label="> 0.45 m/s" lower="0.450000000000000" upper="2.000000000000000" symbol="3"/>
+                <range upper="0.150000000000000" render="true" lower="0.000000000000000" label="&lt; 0.15 m/s" symbol="0"/>
+                <range upper="0.300000000000000" render="true" lower="0.150000000000000" label=" 0.15 - 0.30 m/s" symbol="1"/>
+                <range upper="0.450000000000000" render="true" lower="0.300000000000000" label=" 0.30 - 0.45 m/s " symbol="2"/>
+                <range upper="2.000000000000000" render="true" lower="0.450000000000000" label="> 0.45 m/s" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="2" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="2" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -28677,34 +29436,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -28738,174 +29497,174 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="predeterminado">
-          <qgis version="2.14.10-Essen" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="-4.65661e-10" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1">
+          <qgis simplifyMaxScale="1" simplifyDrawingTol="1" version="2.14.10-Essen" simplifyLocal="1" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyDrawingHints="1">
             <edittypes>
               <edittype widgetv2type="TextEdit" name="arc_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="result_id">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_flow">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_vel">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_headloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_uheadloss">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_setting">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_reaction">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="max_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
               <edittype widgetv2type="TextEdit" name="min_ffactor">
-                <widgetv2config IsMultiline="0" fieldEditable="1" labelOnTop="0" UseHtml="0"/>
+                <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" fieldEditable="1"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+            <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
               <ranges>
-                <range render="true" label="&lt; 0.06" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-                <range render="true" label=" 0.06 - 0.12" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-                <range render="true" label=" 0.10 - 0.18" lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-                <range render="true" label=" > 0.18" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+                <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06" symbol="0"/>
+                <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12" symbol="1"/>
+                <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.10 - 0.18" symbol="2"/>
+                <range upper="200.000000000000000" render="true" lower="0.180000000000000" label=" > 0.18" symbol="3"/>
               </ranges>
               <symbols>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="43,131,186,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="43,131,186,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="199,232,173,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="199,232,173,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="253,201,128,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="253,201,128,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
-                <symbol name="3" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="3" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="215,25,28,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="215,25,28,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </symbols>
               <source-symbol>
-                <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="131,38,197,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.46"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="131,38,197,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.46" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                   </layer>
                 </symbol>
               </source-symbol>
-              <colorramp name="[source]" type="gradient">
-                <prop k="color1" v="215,25,28,255"/>
-                <prop k="color2" v="43,131,186,255"/>
-                <prop k="discrete" v="0"/>
-                <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+              <colorramp type="gradient" name="[source]">
+                <prop v="215,25,28,255" k="color1"/>
+                <prop v="43,131,186,255" k="color2"/>
+                <prop v="0" k="discrete"/>
+                <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
               </colorramp>
               <invertedcolorramp value="1"/>
               <mode name="equal"/>
               <rotation/>
               <sizescale scalemethod="diameter"/>
-              <labelformat decimalplaces="0" trimtrailingzeroes="false" format=" %1 - %2 "/>
+              <labelformat format=" %1 - %2 " decimalplaces="0" trimtrailingzeroes="false"/>
             </renderer-v2>
             <labeling type="simple"/>
             <customproperties>
@@ -29058,34 +29817,34 @@ def my_form_open(dialog, layer, feature):
               <label fieldname="" text="Etiqueta"/>
               <family fieldname="" name="Arial"/>
               <size fieldname="" units="pt" value="12"/>
-              <bold fieldname="" on="0"/>
-              <italic fieldname="" on="0"/>
-              <underline fieldname="" on="0"/>
-              <strikeout fieldname="" on="0"/>
-              <color fieldname="" blue="0" green="0" red="0"/>
+              <bold on="0" fieldname=""/>
+              <italic on="0" fieldname=""/>
+              <underline on="0" fieldname=""/>
+              <strikeout on="0" fieldname=""/>
+              <color fieldname="" green="0" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+              <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
               <angle fieldname="" auto="0" value="0"/>
               <alignment fieldname="" value="center"/>
-              <buffercolor fieldname="" blue="255" green="255" red="255"/>
+              <buffercolor fieldname="" green="255" red="255" blue="255"/>
               <buffersize fieldname="" units="pt" value="1"/>
-              <bufferenabled fieldname="" on=""/>
-              <multilineenabled fieldname="" on=""/>
+              <bufferenabled on="" fieldname=""/>
+              <multilineenabled on="" fieldname=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" penAlpha="255" angleOffset="1440" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" sizeType="MM" barWidth="5" penWidth="0" minimumSize="0">
+              <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
                 <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10"/>
+            <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
             <annotationform/>
             <exclSCHEMA_NAMEeAttributesWMS/>
             <exclSCHEMA_NAMEeAttributesWFS/>
             <attributeactions>
-              <actionsetting name="History aSCHEMA_NAMEit" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" icon="" type="1" capture="0"/>
+              <actionsetting action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" name="History aSCHEMA_NAMEit"/>
             </attributeactions>
             <editform/>
             <editforminit/>
@@ -29125,162 +29884,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -29288,49 +30047,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -29343,27 +30102,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="arc_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="arc_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29372,8 +30131,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -29505,86 +30264,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="max_flow" applyOnUpdate="0" expression=""/>
-        <default field="min_flow" applyOnUpdate="0" expression=""/>
-        <default field="max_vel" applyOnUpdate="0" expression=""/>
-        <default field="min_vel" applyOnUpdate="0" expression=""/>
-        <default field="max_headloss" applyOnUpdate="0" expression=""/>
-        <default field="min_headloss" applyOnUpdate="0" expression=""/>
-        <default field="max_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="min_uheadloss" applyOnUpdate="0" expression=""/>
-        <default field="max_setting" applyOnUpdate="0" expression=""/>
-        <default field="min_setting" applyOnUpdate="0" expression=""/>
-        <default field="max_reaction" applyOnUpdate="0" expression=""/>
-        <default field="min_reaction" applyOnUpdate="0" expression=""/>
-        <default field="max_ffactor" applyOnUpdate="0" expression=""/>
-        <default field="min_ffactor" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="max_flow" expression=""/>
+        <default applyOnUpdate="0" field="min_flow" expression=""/>
+        <default applyOnUpdate="0" field="max_vel" expression=""/>
+        <default applyOnUpdate="0" field="min_vel" expression=""/>
+        <default applyOnUpdate="0" field="max_headloss" expression=""/>
+        <default applyOnUpdate="0" field="min_headloss" expression=""/>
+        <default applyOnUpdate="0" field="max_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="min_uheadloss" expression=""/>
+        <default applyOnUpdate="0" field="max_setting" expression=""/>
+        <default applyOnUpdate="0" field="min_setting" expression=""/>
+        <default applyOnUpdate="0" field="max_reaction" expression=""/>
+        <default applyOnUpdate="0" field="min_reaction" expression=""/>
+        <default applyOnUpdate="0" field="max_ffactor" expression=""/>
+        <default applyOnUpdate="0" field="min_ffactor" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_uheadloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_reaction" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_uheadloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_reaction" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_ffactor" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="max_flow" desc="" exp=""/>
-        <constraint field="min_flow" desc="" exp=""/>
-        <constraint field="max_vel" desc="" exp=""/>
-        <constraint field="min_vel" desc="" exp=""/>
-        <constraint field="max_headloss" desc="" exp=""/>
-        <constraint field="min_headloss" desc="" exp=""/>
-        <constraint field="max_uheadloss" desc="" exp=""/>
-        <constraint field="min_uheadloss" desc="" exp=""/>
-        <constraint field="max_setting" desc="" exp=""/>
-        <constraint field="min_setting" desc="" exp=""/>
-        <constraint field="max_reaction" desc="" exp=""/>
-        <constraint field="min_reaction" desc="" exp=""/>
-        <constraint field="max_ffactor" desc="" exp=""/>
-        <constraint field="min_ffactor" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="max_flow" desc=""/>
+        <constraint exp="" field="min_flow" desc=""/>
+        <constraint exp="" field="max_vel" desc=""/>
+        <constraint exp="" field="min_vel" desc=""/>
+        <constraint exp="" field="max_headloss" desc=""/>
+        <constraint exp="" field="min_headloss" desc=""/>
+        <constraint exp="" field="max_uheadloss" desc=""/>
+        <constraint exp="" field="min_uheadloss" desc=""/>
+        <constraint exp="" field="max_setting" desc=""/>
+        <constraint exp="" field="min_setting" desc=""/>
+        <constraint exp="" field="max_reaction" desc=""/>
+        <constraint exp="" field="min_reaction" desc=""/>
+        <constraint exp="" field="max_ffactor" desc=""/>
+        <constraint exp="" field="min_ffactor" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{30477c70-3fdc-4baa-823d-93a8abdf611b}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="max_flow" hidden="0" width="-1" type="field"/>
-          <column name="min_flow" hidden="0" width="-1" type="field"/>
-          <column name="max_vel" hidden="0" width="-1" type="field"/>
-          <column name="min_vel" hidden="0" width="-1" type="field"/>
-          <column name="max_headloss" hidden="0" width="-1" type="field"/>
-          <column name="min_headloss" hidden="0" width="-1" type="field"/>
-          <column name="max_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="min_uheadloss" hidden="0" width="-1" type="field"/>
-          <column name="max_setting" hidden="0" width="-1" type="field"/>
-          <column name="min_setting" hidden="0" width="-1" type="field"/>
-          <column name="max_reaction" hidden="0" width="-1" type="field"/>
-          <column name="min_reaction" hidden="0" width="-1" type="field"/>
-          <column name="max_ffactor" hidden="0" width="-1" type="field"/>
-          <column name="min_ffactor" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="max_flow"/>
+          <column type="field" width="-1" hidden="0" name="min_flow"/>
+          <column type="field" width="-1" hidden="0" name="max_vel"/>
+          <column type="field" width="-1" hidden="0" name="min_vel"/>
+          <column type="field" width="-1" hidden="0" name="max_headloss"/>
+          <column type="field" width="-1" hidden="0" name="min_headloss"/>
+          <column type="field" width="-1" hidden="0" name="max_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="min_uheadloss"/>
+          <column type="field" width="-1" hidden="0" name="max_setting"/>
+          <column type="field" width="-1" hidden="0" name="min_setting"/>
+          <column type="field" width="-1" hidden="0" name="max_reaction"/>
+          <column type="field" width="-1" hidden="0" name="min_reaction"/>
+          <column type="field" width="-1" hidden="0" name="max_ffactor"/>
+          <column type="field" width="-1" hidden="0" name="min_ffactor"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -29616,29 +30375,29 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="max_ffactor"/>
-        <field editable="0" name="max_flow"/>
-        <field editable="0" name="max_headloss"/>
-        <field editable="0" name="max_reaction"/>
-        <field editable="0" name="max_setting"/>
-        <field editable="0" name="max_uheadloss"/>
-        <field editable="0" name="max_vel"/>
-        <field editable="0" name="min_ffactor"/>
-        <field editable="0" name="min_flow"/>
-        <field editable="0" name="min_headloss"/>
-        <field editable="0" name="min_reaction"/>
-        <field editable="0" name="min_setting"/>
-        <field editable="0" name="min_uheadloss"/>
-        <field editable="0" name="min_vel"/>
-        <field editable="0" name="result_id"/>
+        <field name="arc_id" editable="0"/>
+        <field name="max_ffactor" editable="0"/>
+        <field name="max_flow" editable="0"/>
+        <field name="max_headloss" editable="0"/>
+        <field name="max_reaction" editable="0"/>
+        <field name="max_setting" editable="0"/>
+        <field name="max_uheadloss" editable="0"/>
+        <field name="max_vel" editable="0"/>
+        <field name="min_ffactor" editable="0"/>
+        <field name="min_flow" editable="0"/>
+        <field name="min_headloss" editable="0"/>
+        <field name="min_reaction" editable="0"/>
+        <field name="min_setting" editable="0"/>
+        <field name="min_uheadloss" editable="0"/>
+        <field name="min_vel" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_rpt_comp_arc_hourly20180309112714639</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_arc_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -29698,162 +30457,162 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_headloss" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_headloss" symbollevels="0">
         <ranges>
-          <range render="true" label="&lt; 0.06 mm/m" lower="0.000000000000000" upper="0.060000000000000" symbol="0"/>
-          <range render="true" label=" 0.06 - 0.12 mm/m" lower="0.060000000000000" upper="0.120000000000000" symbol="1"/>
-          <range render="true" label=" 0.12 - 0.18 mm/m " lower="0.120000000000000" upper="0.180000000000000" symbol="2"/>
-          <range render="true" label="> 0.18 mm/m" lower="0.180000000000000" upper="200.000000000000000" symbol="3"/>
+          <range upper="0.060000000000000" render="true" lower="0.000000000000000" label="&lt; 0.06 mm/m" symbol="0"/>
+          <range upper="0.120000000000000" render="true" lower="0.060000000000000" label=" 0.06 - 0.12 mm/m" symbol="1"/>
+          <range upper="0.180000000000000" render="true" lower="0.120000000000000" label=" 0.12 - 0.18 mm/m " symbol="2"/>
+          <range upper="200.000000000000000" render="true" lower="0.180000000000000" label="> 0.18 mm/m" symbol="3"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="43,131,186,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="43,131,186,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="199,232,173,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="199,232,173,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,201,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,201,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="215,25,28,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="215,25,28,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="131,38,197,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="131,38,197,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -29861,49 +30620,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="&quot;max_uheadloss&quot; || ' %'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="&quot;max_uheadloss&quot; || ' %'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="3" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="3" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -29916,27 +30675,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -29952,8 +30711,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -30022,58 +30781,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="flow" applyOnUpdate="0" expression=""/>
-        <default field="vel" applyOnUpdate="0" expression=""/>
-        <default field="headloss" applyOnUpdate="0" expression=""/>
-        <default field="setting" applyOnUpdate="0" expression=""/>
-        <default field="ffactor" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="flow" expression=""/>
+        <default applyOnUpdate="0" field="vel" expression=""/>
+        <default applyOnUpdate="0" field="headloss" expression=""/>
+        <default applyOnUpdate="0" field="setting" expression=""/>
+        <default applyOnUpdate="0" field="ffactor" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="flow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vel" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="headloss" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="setting" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ffactor" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="flow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vel" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="headloss" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="setting" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ffactor" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="flow" desc="" exp=""/>
-        <constraint field="vel" desc="" exp=""/>
-        <constraint field="headloss" desc="" exp=""/>
-        <constraint field="setting" desc="" exp=""/>
-        <constraint field="ffactor" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="flow" desc=""/>
+        <constraint exp="" field="vel" desc=""/>
+        <constraint exp="" field="headloss" desc=""/>
+        <constraint exp="" field="setting" desc=""/>
+        <constraint exp="" field="ffactor" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" notificationMessage="" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Arc_minimum_values_copiar20131203151650523',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f1719dfe-60ff-43ae-9418-f3f008c146ee}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="flow" hidden="0" width="-1" type="field"/>
-          <column name="vel" hidden="0" width="-1" type="field"/>
-          <column name="headloss" hidden="0" width="-1" type="field"/>
-          <column name="setting" hidden="0" width="-1" type="field"/>
-          <column name="ffactor" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="flow"/>
+          <column type="field" width="-1" hidden="0" name="vel"/>
+          <column type="field" width="-1" hidden="0" name="headloss"/>
+          <column type="field" width="-1" hidden="0" name="setting"/>
+          <column type="field" width="-1" hidden="0" name="ffactor"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30105,22 +30864,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="arc_id"/>
-        <field editable="0" name="ffactor"/>
-        <field editable="0" name="flow"/>
-        <field editable="0" name="headloss"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="setting"/>
-        <field editable="0" name="time"/>
-        <field editable="0" name="vel"/>
+        <field name="arc_id" editable="0"/>
+        <field name="ffactor" editable="0"/>
+        <field name="flow" editable="0"/>
+        <field name="headloss" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="setting" editable="0"/>
+        <field name="time" editable="0"/>
+        <field name="vel" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "arc_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_energy_usage20160710012004617</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_energy_usage" sql=</datasource>
       <shortname>v_rpt_comp_energy_usage</shortname>
@@ -30182,7 +30941,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30219,8 +30978,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -30268,52 +31027,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="nodarc_id" applyOnUpdate="0" expression=""/>
-        <default field="usage_fact" applyOnUpdate="0" expression=""/>
-        <default field="avg_effic" applyOnUpdate="0" expression=""/>
-        <default field="kwhr_mgal" applyOnUpdate="0" expression=""/>
-        <default field="avg_kw" applyOnUpdate="0" expression=""/>
-        <default field="peak_kw" applyOnUpdate="0" expression=""/>
-        <default field="cost_day" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodarc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="usage_fact" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_effic" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="kwhr_mgal" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="peak_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost_day" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="nodarc_id" desc="" exp=""/>
-        <constraint field="usage_fact" desc="" exp=""/>
-        <constraint field="avg_effic" desc="" exp=""/>
-        <constraint field="kwhr_mgal" desc="" exp=""/>
-        <constraint field="avg_kw" desc="" exp=""/>
-        <constraint field="peak_kw" desc="" exp=""/>
-        <constraint field="cost_day" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="nodarc_id" hidden="0" width="-1" type="field"/>
-          <column name="usage_fact" hidden="0" width="-1" type="field"/>
-          <column name="avg_effic" hidden="0" width="-1" type="field"/>
-          <column name="kwhr_mgal" hidden="0" width="-1" type="field"/>
-          <column name="avg_kw" hidden="0" width="-1" type="field"/>
-          <column name="peak_kw" hidden="0" width="-1" type="field"/>
-          <column name="cost_day" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30329,22 +31088,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="avg_effic"/>
-        <field editable="0" name="avg_kw"/>
-        <field editable="0" name="cost_day"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="kwhr_mgal"/>
-        <field editable="0" name="nodarc_id"/>
-        <field editable="0" name="peak_kw"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="usage_fact"/>
+        <field name="avg_effic" editable="0"/>
+        <field name="avg_kw" editable="0"/>
+        <field name="cost_day" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="kwhr_mgal" editable="0"/>
+        <field name="nodarc_id" editable="0"/>
+        <field name="peak_kw" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="usage_fact" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE("id", '&lt;NULL>')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_comp_hydraulic_status20160710012004648</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_hydraulic_status" sql=</datasource>
       <shortname>v_rpt_comp_hydraulic_status</shortname>
@@ -30406,7 +31165,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30415,8 +31174,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -30452,32 +31211,32 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -30493,17 +31252,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="text"/>
-        <field editable="0" name="time"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="text" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node20160710012004695</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <shortname>v_rpt_comp_node</shortname>
@@ -30564,202 +31323,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -30767,49 +31526,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -30822,27 +31581,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -30957,64 +31716,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f410c0b8-cbe7-45e1-b0a2-0e2cb254bca5}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="0" width="-1" type="field"/>
-          <column name="min_head" hidden="0" width="-1" type="field"/>
-          <column name="min_pressure" hidden="0" width="-1" type="field"/>
-          <column name="min_quality" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="min_demand"/>
+          <column type="field" width="-1" hidden="0" name="min_head"/>
+          <column type="field" width="-1" hidden="0" name="min_pressure"/>
+          <column type="field" width="-1" hidden="0" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31046,26 +31805,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="max_demand"/>
-        <field editable="0" name="max_head"/>
-        <field editable="0" name="max_pressure"/>
-        <field editable="0" name="max_quality"/>
-        <field editable="0" name="min_demand"/>
-        <field editable="0" name="min_head"/>
-        <field editable="0" name="min_pressure"/>
-        <field editable="0" name="min_quality"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="result_id"/>
+        <field name="elevation" editable="0"/>
+        <field name="max_demand" editable="0"/>
+        <field name="max_head" editable="0"/>
+        <field name="max_pressure" editable="0"/>
+        <field name="max_quality" editable="0"/>
+        <field name="min_demand" editable="0"/>
+        <field name="min_head" editable="0"/>
+        <field name="min_pressure" editable="0"/>
+        <field name="min_quality" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_copiar20161230144859228</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -31125,202 +31884,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -31328,49 +32087,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -31383,27 +32142,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31412,8 +32171,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31422,8 +32181,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31432,8 +32191,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31442,8 +32201,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31452,8 +32211,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31462,8 +32221,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31479,8 +32238,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31496,8 +32255,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31513,8 +32272,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31545,64 +32304,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{5b334259-4694-4093-810f-160d8a437c1d}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5b334259-4694-4093-810f-160d8a437c1d}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31639,7 +32398,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="0" simplifyDrawingHints="1" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_comp_node_hourly20180309112714764</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_comp_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -31699,33 +32458,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="211,184,132,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="211,184,132,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31738,7 +32497,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31775,8 +32534,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -31824,52 +32583,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="press" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="press" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="press" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="demand" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="press" hidden="0" width="-1" type="field"/>
-          <column name="quality" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="demand"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="press"/>
+          <column type="field" width="-1" hidden="0" name="quality"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -31885,22 +32644,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="demand"/>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="head"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="press"/>
-        <field editable="0" name="quality"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="time"/>
+        <field name="demand" editable="0"/>
+        <field name="elevation" editable="0"/>
+        <field name="head" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="press" editable="0"/>
+        <field name="quality" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_energy_usage20180201122650430</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_energy_usage" sql=</datasource>
       <keywordList>
@@ -31961,7 +32720,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -31998,8 +32757,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -32047,52 +32806,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="nodarc_id" applyOnUpdate="0" expression=""/>
-        <default field="usage_fact" applyOnUpdate="0" expression=""/>
-        <default field="avg_effic" applyOnUpdate="0" expression=""/>
-        <default field="kwhr_mgal" applyOnUpdate="0" expression=""/>
-        <default field="avg_kw" applyOnUpdate="0" expression=""/>
-        <default field="peak_kw" applyOnUpdate="0" expression=""/>
-        <default field="cost_day" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="nodarc_id" expression=""/>
+        <default applyOnUpdate="0" field="usage_fact" expression=""/>
+        <default applyOnUpdate="0" field="avg_effic" expression=""/>
+        <default applyOnUpdate="0" field="kwhr_mgal" expression=""/>
+        <default applyOnUpdate="0" field="avg_kw" expression=""/>
+        <default applyOnUpdate="0" field="peak_kw" expression=""/>
+        <default applyOnUpdate="0" field="cost_day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodarc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="usage_fact" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_effic" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="kwhr_mgal" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="avg_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="peak_kw" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cost_day" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodarc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="usage_fact" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_effic" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="kwhr_mgal" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="avg_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="peak_kw" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cost_day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="nodarc_id" desc="" exp=""/>
-        <constraint field="usage_fact" desc="" exp=""/>
-        <constraint field="avg_effic" desc="" exp=""/>
-        <constraint field="kwhr_mgal" desc="" exp=""/>
-        <constraint field="avg_kw" desc="" exp=""/>
-        <constraint field="peak_kw" desc="" exp=""/>
-        <constraint field="cost_day" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="nodarc_id" desc=""/>
+        <constraint exp="" field="usage_fact" desc=""/>
+        <constraint exp="" field="avg_effic" desc=""/>
+        <constraint exp="" field="kwhr_mgal" desc=""/>
+        <constraint exp="" field="avg_kw" desc=""/>
+        <constraint exp="" field="peak_kw" desc=""/>
+        <constraint exp="" field="cost_day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="nodarc_id" hidden="0" width="-1" type="field"/>
-          <column name="usage_fact" hidden="0" width="-1" type="field"/>
-          <column name="avg_effic" hidden="0" width="-1" type="field"/>
-          <column name="kwhr_mgal" hidden="0" width="-1" type="field"/>
-          <column name="avg_kw" hidden="0" width="-1" type="field"/>
-          <column name="peak_kw" hidden="0" width="-1" type="field"/>
-          <column name="cost_day" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="nodarc_id"/>
+          <column type="field" width="-1" hidden="0" name="usage_fact"/>
+          <column type="field" width="-1" hidden="0" name="avg_effic"/>
+          <column type="field" width="-1" hidden="0" name="kwhr_mgal"/>
+          <column type="field" width="-1" hidden="0" name="avg_kw"/>
+          <column type="field" width="-1" hidden="0" name="peak_kw"/>
+          <column type="field" width="-1" hidden="0" name="cost_day"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -32108,22 +32867,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="avg_effic"/>
-        <field editable="0" name="avg_kw"/>
-        <field editable="0" name="cost_day"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="kwhr_mgal"/>
-        <field editable="0" name="nodarc_id"/>
-        <field editable="0" name="peak_kw"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="usage_fact"/>
+        <field name="avg_effic" editable="0"/>
+        <field name="avg_kw" editable="0"/>
+        <field name="cost_day" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="kwhr_mgal" editable="0"/>
+        <field name="nodarc_id" editable="0"/>
+        <field name="peak_kw" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="usage_fact" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshTime="0" wkbType="NoGeometry" refreshOnNotifyEnabled="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" readOnly="0">
+    <maplayer refreshOnNotifyEnabled="0" readOnly="0" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" geometry="No geometry" styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="NoGeometry">
       <id>v_rpt_hydraulic_status20131203141738132</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_hydraulic_status" sql=</datasource>
       <keywordList>
@@ -32184,7 +32943,7 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties/>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -32193,8 +32952,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -32230,38 +32989,38 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="time" desc=""/>
+        <constraint exp="" field="text" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" notificationMessage="" id="{678b4af2-e189-408a-baf7-c84b798c5250}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('v_rpt_hydraulic_status20131203141738132',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{678b4af2-e189-408a-baf7-c84b798c5250}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="time" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="time"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -32277,17 +33036,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="id"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="text"/>
-        <field editable="0" name="time"/>
+        <field name="id" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="text" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node20180206173632034</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) sql=</datasource>
       <keywordList>
@@ -32347,202 +33106,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="min_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="min_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -32550,49 +33309,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="60,60,60,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="60,60,60,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="1.5" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="1.5" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -32605,27 +33364,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="node_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="node_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -32740,64 +33499,64 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="max_demand" applyOnUpdate="0" expression=""/>
-        <default field="min_demand" applyOnUpdate="0" expression=""/>
-        <default field="max_head" applyOnUpdate="0" expression=""/>
-        <default field="min_head" applyOnUpdate="0" expression=""/>
-        <default field="max_pressure" applyOnUpdate="0" expression=""/>
-        <default field="min_pressure" applyOnUpdate="0" expression=""/>
-        <default field="max_quality" applyOnUpdate="0" expression=""/>
-        <default field="min_quality" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="max_demand" expression=""/>
+        <default applyOnUpdate="0" field="min_demand" expression=""/>
+        <default applyOnUpdate="0" field="max_head" expression=""/>
+        <default applyOnUpdate="0" field="min_head" expression=""/>
+        <default applyOnUpdate="0" field="max_pressure" expression=""/>
+        <default applyOnUpdate="0" field="min_pressure" expression=""/>
+        <default applyOnUpdate="0" field="max_quality" expression=""/>
+        <default applyOnUpdate="0" field="min_quality" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_pressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="max_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="min_quality" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_pressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="max_quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="min_quality" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="max_demand" desc="" exp=""/>
-        <constraint field="min_demand" desc="" exp=""/>
-        <constraint field="max_head" desc="" exp=""/>
-        <constraint field="min_head" desc="" exp=""/>
-        <constraint field="max_pressure" desc="" exp=""/>
-        <constraint field="min_pressure" desc="" exp=""/>
-        <constraint field="max_quality" desc="" exp=""/>
-        <constraint field="min_quality" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="max_demand" desc=""/>
+        <constraint exp="" field="min_demand" desc=""/>
+        <constraint exp="" field="max_head" desc=""/>
+        <constraint exp="" field="min_head" desc=""/>
+        <constraint exp="" field="max_pressure" desc=""/>
+        <constraint exp="" field="min_pressure" desc=""/>
+        <constraint exp="" field="max_quality" desc=""/>
+        <constraint exp="" field="min_quality" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{5ddd6913-6069-4c0f-b36a-b146ee0e529a}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="max_demand" hidden="0" width="-1" type="field"/>
-          <column name="max_head" hidden="0" width="-1" type="field"/>
-          <column name="max_pressure" hidden="0" width="-1" type="field"/>
-          <column name="max_quality" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="max_demand"/>
+          <column type="field" width="-1" hidden="0" name="max_head"/>
+          <column type="field" width="-1" hidden="0" name="max_pressure"/>
+          <column type="field" width="-1" hidden="0" name="max_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -32829,26 +33588,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="max_demand"/>
-        <field editable="0" name="max_head"/>
-        <field editable="0" name="max_pressure"/>
-        <field editable="0" name="max_quality"/>
-        <field editable="0" name="min_demand"/>
-        <field editable="0" name="min_head"/>
-        <field editable="0" name="min_pressure"/>
-        <field editable="0" name="min_quality"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="result_id"/>
+        <field name="elevation" editable="0"/>
+        <field name="max_demand" editable="0"/>
+        <field name="max_head" editable="0"/>
+        <field name="max_pressure" editable="0"/>
+        <field name="max_quality" editable="0"/>
+        <field name="min_demand" editable="0"/>
+        <field name="min_head" editable="0"/>
+        <field name="min_pressure" editable="0"/>
+        <field name="min_quality" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="result_id" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>COALESCE( "node_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_all20180309112714890</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_all" (the_geom) sql=</datasource>
       <keywordList>
@@ -32908,202 +33667,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -33111,49 +33870,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -33166,27 +33925,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -33237,8 +33996,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -33288,58 +34047,58 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="press" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="press" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="press" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{f16a4e2b-ebf0-49f3-8d4a-9083374f5387}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -33371,24 +34130,24 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="demand"/>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="head"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="node_type"/>
-        <field editable="0" name="nodecat_id"/>
-        <field editable="0" name="press"/>
-        <field editable="0" name="quality"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="time"/>
+        <field name="demand" editable="0"/>
+        <field name="elevation" editable="0"/>
+        <field name="head" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="node_type" editable="0"/>
+        <field name="nodecat_id" editable="0"/>
+        <field name="press" editable="0"/>
+        <field name="quality" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="25000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="-4.65661e-10" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="-4.65661e-10" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="25000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_rpt_node_hourly20180309112715024</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_hourly" (the_geom) sql=</datasource>
       <keywordList>
@@ -33448,202 +34207,202 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="max_pressure" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" forceraster="0">
+      <renderer-v2 type="graduatedSymbol" graduatedMethod="GraduatedColor" forceraster="0" enableorderby="0" attr="max_pressure" symbollevels="0">
         <ranges>
-          <range render="true" label="Negative pressures" lower="-10000.000000000000000" upper="0.000000000000000" symbol="0"/>
-          <range render="true" label="0-15 wcm" lower="0.000000000000000" upper="15.000000000000000" symbol="1"/>
-          <range render="true" label="15-60 wcm" lower="15.000000000000000" upper="60.000000000000000" symbol="2"/>
-          <range render="true" label="60-75 wcm" lower="60.000000000000000" upper="75.000000000000000" symbol="3"/>
-          <range render="true" label="> 75 wcm" lower="75.000000000000000" upper="10000.000000000000000" symbol="4"/>
+          <range upper="0.000000000000000" render="true" lower="-10000.000000000000000" label="Negative pressures" symbol="0"/>
+          <range upper="15.000000000000000" render="true" lower="0.000000000000000" label="0-15 wcm" symbol="1"/>
+          <range upper="60.000000000000000" render="true" lower="15.000000000000000" label="15-60 wcm" symbol="2"/>
+          <range upper="75.000000000000000" render="true" lower="60.000000000000000" label="60-75 wcm" symbol="3"/>
+          <range upper="10000.000000000000000" render="true" lower="75.000000000000000" label="> 75 wcm" symbol="4"/>
         </ranges>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="43,131,186,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="43,131,186,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="171,221,164,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="171,221,164,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,191,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,191,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="253,174,97,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="253,174,97,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="215,25,28,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="215,25,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="163,86,107,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="0,0,0,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="area"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="163,86,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </source-symbol>
-        <colorramp name="[source]" type="gradient">
-          <prop k="color1" v="215,25,28,255"/>
-          <prop k="color2" v="43,131,186,255"/>
-          <prop k="discrete" v="0"/>
-          <prop k="rampType" v="gradient"/>
-          <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
+        <colorramp type="gradient" name="[source]">
+          <prop v="215,25,28,255" k="color1"/>
+          <prop v="43,131,186,255" k="color2"/>
+          <prop v="0" k="discrete"/>
+          <prop v="gradient" k="rampType"/>
+          <prop v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255" k="stops"/>
         </colorramp>
         <classificationMethod id="EqualInterval">
-          <symmetricMode symmetrypoint="0" astride="0" enabled="0"/>
-          <labelFormat labelprecision="4" trimtrailingzeroes="1" format="%1 - %2 "/>
+          <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+          <labelFormat format="%1 - %2 " labelprecision="4" trimtrailingzeroes="1"/>
           <extraInformation/>
         </classificationMethod>
         <rotation/>
@@ -33651,49 +34410,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Bold" textOrientation="horizontal" textColor="55,55,55,255" fontWeight="75" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="7" fontFamily="Arial" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'">
-            <text-buffer bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+          <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Bold" fontSizeUnit="Point" textOrientation="horizontal" textColor="55,55,55,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'min: ' || &quot;min_pressure&quot; || ' wcm' || '_' || 'max: ' || &quot;max_pressure&quot; || ' wcm'" fontSize="7" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="_" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="0" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="0" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="0" maxCurvedCharAngleIn="20" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="_"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="20" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="0" centroidInside="0" placement="0" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -33706,27 +34465,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-4.65661e-10" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="-4.65661e-10" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="10">
+      <DiagramLayerSettings linePlacementFlags="10" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -33763,8 +34522,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -33812,52 +34571,52 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="demand" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="press" applyOnUpdate="0" expression=""/>
-        <default field="quality" applyOnUpdate="0" expression=""/>
-        <default field="time" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="demand" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="press" expression=""/>
+        <default applyOnUpdate="0" field="quality" expression=""/>
+        <default applyOnUpdate="0" field="time" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="demand" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="press" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quality" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="time" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="demand" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="press" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="quality" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="time" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="demand" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="press" desc="" exp=""/>
-        <constraint field="quality" desc="" exp=""/>
-        <constraint field="time" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="demand" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="press" desc=""/>
+        <constraint exp="" field="quality" desc=""/>
+        <constraint exp="" field="time" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" notificationMessage="" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('Node_minimum_values_copiar20131203150948351',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{eb65e3b2-8750-4f0e-8b03-37e79e841060}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="min_demand" hidden="1" width="-1" type="field"/>
-          <column name="min_head" hidden="1" width="-1" type="field"/>
-          <column name="min_pressure" hidden="1" width="-1" type="field"/>
-          <column name="min_quality" hidden="1" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="1" name="min_demand"/>
+          <column type="field" width="-1" hidden="1" name="min_head"/>
+          <column type="field" width="-1" hidden="1" name="min_pressure"/>
+          <column type="field" width="-1" hidden="1" name="min_quality"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -33889,22 +34648,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="demand"/>
-        <field editable="0" name="elevation"/>
-        <field editable="0" name="head"/>
-        <field editable="0" name="id"/>
-        <field editable="0" name="node_id"/>
-        <field editable="0" name="press"/>
-        <field editable="0" name="quality"/>
-        <field editable="0" name="result_id"/>
-        <field editable="0" name="time"/>
+        <field name="demand" editable="0"/>
+        <field name="elevation" editable="0"/>
+        <field name="head" editable="0"/>
+        <field name="id" editable="0"/>
+        <field name="node_id" editable="0"/>
+        <field name="press" editable="0"/>
+        <field name="quality" editable="0"/>
+        <field name="result_id" editable="0"/>
+        <field name="time" editable="0"/>
       </editable>
       <labelOnTop/>
       <widgets/>
       <previewExpression>"node_id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -33963,7 +34722,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -33987,26 +34746,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34024,27 +34783,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -34071,26 +34830,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34122,8 +34881,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="connec_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -34133,7 +34892,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -34192,7 +34951,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -34216,26 +34975,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34253,27 +35012,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -34300,26 +35059,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34351,8 +35110,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -34362,7 +35121,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -34421,7 +35180,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -34445,26 +35204,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34482,27 +35241,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -34529,26 +35288,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -34580,8 +35339,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -34654,14 +35413,14 @@ def my_form_open(dialog, layer, feature):
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -35352,63 +36111,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="composer_plan" units="mm" worldFileMap="" printResolution="300">
-      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
-      <Grid offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" referencePoint="0" groupUuid="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" blendMode="0" position="0,0,mm" zValue="0" frameJoinStyle="miter" visibility="1" id="" size="210,297,mm" positionOnPage="0,0,mm" itemRotation="0" background="true">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35416,446 +36175,446 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" svgBorderWidth="0.2" frame="false" anchorPoint="0" pictureWidth="8.01076" excludeFromExports="0" svgBorderColor="0,0,0,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" pictureRotation="0" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" resizeMode="0" blendMode="0" position="21.2488,12.0899,mm" zValue="34" pictureHeight="8.05991" frameJoinStyle="miter" mapUuid="" visibility="1" svgFillColor="255,255,255,255" id="" size="52.9371,8.05991,mm" northMode="0" positionOnPage="21.2488,12.0899,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" labelText="Planified network:  [% &quot;plan_length&quot; %] m." halign="1" blendMode="0" position="18.5098,248.929,mm" zValue="34" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,248.929,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" labelText="Affected network:  [% &quot;affec_length&quot; %] m." halign="1" blendMode="0" position="18.5098,240.85,mm" zValue="33" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,240.85,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" halign="2" blendMode="0" position="130.06,170.278,mm" zValue="32" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="130.06,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" halign="2" blendMode="0" position="129.892,162.595,mm" zValue="31" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.892,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" halign="2" blendMode="0" position="129.892,154.849,mm" zValue="30" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.892,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" blendMode="0" position="18.5119,237.417,mm" zValue="29" frameJoinStyle="miter" visibility="1" id="" size="107.352,0.232607,mm" positionOnPage="18.5119,237.417,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" labelText="Total cost of other works:" halign="1" blendMode="0" position="18.472,170.278,mm" zValue="28" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.07458,mm" positionOnPage="18.472,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" blendMode="0" position="18.472,180.075,mm" zValue="27" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,180.075,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,191.26,mm" zValue="26" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.798,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,184.169,mm" zValue="25" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.798,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" halign="1" blendMode="0" position="18.5098,144.841,mm" zValue="24" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="97.7075,5.87319,mm" positionOnPage="18.5098,144.841,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" labelText="Total cost for node elements:" halign="1" blendMode="0" position="18.472,162.595,mm" zValue="23" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.87319,mm" positionOnPage="18.472,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" blendMode="0" position="18.4712,202.127,mm" zValue="22" frameJoinStyle="miter" visibility="1" id="" size="178.105,0.232607,mm" positionOnPage="18.4712,202.127,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" blendMode="0" position="18.472,149.994,mm" zValue="21" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,149.994,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" blendMode="0" position="17.1613,8.922,mm" zValue="19" frameJoinStyle="miter" visibility="1" id="" size="0.851544,16.1039,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" blendMode="0" position="17.1613,8.922,mm" zValue="18" frameJoinStyle="miter" visibility="1" id="" size="179.415,0.863719,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="true" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" mapFlags="0" blendMode="0" position="131.014,237.517,mm" zValue="17" frameJoinStyle="miter" visibility="1" followPreset="false" id="" size="65.4621,46.5539,mm" keepLayerSet="true" positionOnPage="131.014,237.517,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4577071.35527538601309061" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymin="4576100.62452332023531199"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" layerid="ext_municipality20171204170633784">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -36015,66 +36774,66 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="muni_id" name="" index="0"/>
-                <alias field="name" name="" index="1"/>
-                <alias field="observ" name="" index="2"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="name" hidden="0" width="183" type="field"/>
-                  <column name="observ" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -36106,442 +36865,442 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="muni_id" expression=""/>
-                <default field="name" expression=""/>
-                <default field="observ" expression=""/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="name"/>
+                <default expression="" field="observ"/>
               </defaults>
               <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_dimensions20170628134034849">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-                  <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-                  <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol name="@2@1" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@2@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol name="@2@3" alpha="1" clip_to_extent="1" type="fill">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleFill">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol name="@2@4" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -36550,143 +37309,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule scalemindenom="1" key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -36846,88 +37605,88 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="distance" name="" index="1"/>
-                <alias field="depth" name="" index="2"/>
-                <alias field="x_label" name="" index="3"/>
-                <alias field="y_label" name="" index="4"/>
-                <alias field="rotation_label" name="" index="5"/>
-                <alias field="offset_label" name="" index="6"/>
-                <alias field="direction_arrow" name="" index="7"/>
-                <alias field="x_symbol" name="" index="8"/>
-                <alias field="y_symbol" name="" index="9"/>
-                <alias field="feature_id" name="" index="10"/>
-                <alias field="feature_type" name="" index="11"/>
-                <alias field="state" name="" index="12"/>
-                <alias field="expl_id" name="" index="13"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+              <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="distance" hidden="0" width="-1" type="field"/>
-                  <column name="depth" hidden="0" width="-1" type="field"/>
-                  <column name="x_label" hidden="0" width="-1" type="field"/>
-                  <column name="y_label" hidden="0" width="-1" type="field"/>
-                  <column name="rotation_label" hidden="0" width="-1" type="field"/>
-                  <column name="offset_label" hidden="0" width="-1" type="field"/>
-                  <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-                  <column name="x_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="y_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="feature_id" hidden="0" width="-1" type="field"/>
-                  <column name="feature_type" hidden="0" width="-1" type="field"/>
-                  <column name="state" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -36959,151 +37718,151 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="distance" expression=""/>
-                <default field="depth" expression=""/>
-                <default field="x_label" expression=""/>
-                <default field="y_label" expression=""/>
-                <default field="rotation_label" expression=""/>
-                <default field="offset_label" expression=""/>
-                <default field="direction_arrow" expression=""/>
-                <default field="x_symbol" expression=""/>
-                <default field="y_symbol" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="feature_type" expression=""/>
-                <default field="state" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="distance"/>
+                <default expression="" field="depth"/>
+                <default expression="" field="x_label"/>
+                <default expression="" field="y_label"/>
+                <default expression="" field="rotation_label"/>
+                <default expression="" field="offset_label"/>
+                <default expression="" field="direction_arrow"/>
+                <default expression="" field="x_symbol"/>
+                <default expression="" field="y_symbol"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="feature_type"/>
+                <default expression="" field="state"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_samplepoint20170619120830016">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="dma_id" notNull="0" Layer="v_edit_dma20180201085045064" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_state20160216123517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="muni_id" notNull="0" Layer="ext_municipality20171204170633784" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="ext_streetaxis20160528211138508" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="postnumber" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="postnumber" notNull="0" Layer="ext_address20171204171433160" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_verified20160216164517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="expl_id" notNull="0" Layer="exploitation20180122152954062" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                     <layer locked="0" pass="0" class="FontMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -37263,85 +38022,85 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer classificationAttributeExpression="" upperValue="0" attributeLegend="1" upperHeight="50" lowerValue="0" diagramType="Histogram" lowerWidth="0" upperWidth="50" sizeLegend="0" lowerHeight="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="sample_id" name="" index="0"/>
-                <alias field="code" name="" index="1"/>
-                <alias field="lab_code" name="" index="2"/>
-                <alias field="feature_id" name="" index="3"/>
-                <alias field="featurecat_id" name="" index="4"/>
-                <alias field="dma_id" name="" index="5"/>
-                <alias field="macrodma_id" name="" index="6"/>
-                <alias field="presszonecat_id" name="" index="7"/>
-                <alias field="state" name="" index="8"/>
-                <alias field="builtdate" name="" index="9"/>
-                <alias field="enddate" name="" index="10"/>
-                <alias field="workcat_id" name="" index="11"/>
-                <alias field="workcat_id_end" name="" index="12"/>
-                <alias field="rotation" name="" index="13"/>
-                <alias field="muni_id" name="" index="14"/>
-                <alias field="streetaxis_id" name="" index="15"/>
-                <alias field="postnumber" name="" index="16"/>
-                <alias field="postcode" name="" index="17"/>
-                <alias field="streetaxis2_id" name="" index="18"/>
-                <alias field="postnumber2" name="" index="19"/>
-                <alias field="postcomplement" name="" index="20"/>
-                <alias field="postcomplement2" name="" index="21"/>
-                <alias field="place_name" name="" index="22"/>
-                <alias field="cabinet" name="" index="23"/>
-                <alias field="observations" name="" index="24"/>
-                <alias field="verified" name="" index="25"/>
-                <alias field="expl_id" name="" index="26"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -37373,85 +38132,85 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="sample_id" expression=""/>
-                <default field="code" expression=""/>
-                <default field="lab_code" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="featurecat_id" expression=""/>
-                <default field="dma_id" expression=""/>
-                <default field="macrodma_id" expression=""/>
-                <default field="presszonecat_id" expression=""/>
-                <default field="state" expression=""/>
-                <default field="builtdate" expression=""/>
-                <default field="enddate" expression=""/>
-                <default field="workcat_id" expression=""/>
-                <default field="workcat_id_end" expression=""/>
-                <default field="rotation" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis2_id" expression=""/>
-                <default field="postnumber2" expression=""/>
-                <default field="postcomplement" expression=""/>
-                <default field="postcomplement2" expression=""/>
-                <default field="place_name" expression=""/>
-                <default field="cabinet" expression=""/>
-                <default field="observations" expression=""/>
-                <default field="verified" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="sample_id"/>
+                <default expression="" field="code"/>
+                <default expression="" field="lab_code"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="featurecat_id"/>
+                <default expression="" field="dma_id"/>
+                <default expression="" field="macrodma_id"/>
+                <default expression="" field="presszonecat_id"/>
+                <default expression="" field="state"/>
+                <default expression="" field="builtdate"/>
+                <default expression="" field="enddate"/>
+                <default expression="" field="workcat_id"/>
+                <default expression="" field="workcat_id_end"/>
+                <default expression="" field="rotation"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis2_id"/>
+                <default expression="" field="postnumber2"/>
+                <default expression="" field="postcomplement"/>
+                <default expression="" field="postcomplement2"/>
+                <default expression="" field="place_name"/>
+                <default expression="" field="cabinet"/>
+                <default expression="" field="observations"/>
+                <default expression="" field="verified"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_address20180201103159332">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -37610,74 +38369,74 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="muni_id" name="" index="1"/>
-                <alias field="postcode" name="" index="2"/>
-                <alias field="streetaxis_id" name="" index="3"/>
-                <alias field="postnumber" name="" index="4"/>
-                <alias field="plot_id" name="" index="5"/>
-                <alias field="expl_id" name="" index="6"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="postcode" hidden="0" width="-1" type="field"/>
-                  <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-                  <column name="postnumber" hidden="0" width="-1" type="field"/>
-                  <column name="plot_id" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -37709,73 +38468,73 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="plot_id" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="plot_id"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_plot20180201103159443">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -37934,70 +38693,70 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="plot_code" name="" index="1"/>
-                <alias field="muni_id" name="" index="2"/>
-                <alias field="postcode" name="" index="3"/>
-                <alias field="streetaxis_id" name="" index="4"/>
-                <alias field="postnumber" name="" index="5"/>
-                <alias field="complement" name="" index="6"/>
-                <alias field="placement" name="" index="7"/>
-                <alias field="square" name="" index="8"/>
-                <alias field="observ" name="" index="9"/>
-                <alias field="text" name="" index="10"/>
-                <alias field="expl_id" name="" index="11"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -38029,116 +38788,116 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="plot_code" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="complement" expression=""/>
-                <default field="placement" expression=""/>
-                <default field="square" expression=""/>
-                <default field="observ" expression=""/>
-                <default field="text" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="plot_code"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="complement"/>
+                <default expression="" field="placement"/>
+                <default expression="" field="square"/>
+                <default expression="" field="observ"/>
+                <default expression="" field="text"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression/>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" name="Vista general 1" position="3" frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" blendMode="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" centered="0">
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -38146,9 +38905,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -38157,399 +38916,399 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{04100234-7357-49e1-9d15-b7949d417719}" blendMode="0" position="17.1613,22.2695,mm" zValue="16" frameJoinStyle="miter" visibility="1" id="" size="179.415,2.75637,mm" positionOnPage="17.1613,22.2695,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" labelText="[% &quot;observ&quot; %]" halign="1" blendMode="0" position="40.013,223.173,mm" zValue="15" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="149.138,11.1067,mm" positionOnPage="40.013,223.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" labelText="[% &quot;descript&quot; %]" halign="1" blendMode="0" position="37.635,212.191,mm" zValue="14" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="153.454,10.5555,mm" positionOnPage="37.635,212.191,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" halign="1" blendMode="0" position="18.472,191.26,mm" zValue="13" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="77.862,4.52331,mm" positionOnPage="18.472,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" labelText="Observations:" halign="1" blendMode="0" position="18.2394,224.173,mm" zValue="12" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="24.3323,3.60837,mm" positionOnPage="18.2394,224.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" halign="1" blendMode="0" position="18.472,184.169,mm" zValue="11" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,5.87319,mm" positionOnPage="18.472,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" svgBorderWidth="0" frame="false" anchorPoint="0" pictureWidth="5.27855" excludeFromExports="0" svgBorderColor="255,255,255,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" pictureRotation="90" file="arrows/NorthArrow_10.svg" resizeMode="0" blendMode="0" position="186.801,128.951,mm" zValue="10" pictureHeight="6.83615" frameJoinStyle="miter" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" visibility="1" svgFillColor="0,0,0,255" id="compass" size="6.83615,6.83615,mm" northMode="0" positionOnPage="186.801,128.951,mm" itemRotation="0" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="128" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" labelText="Total cost for arc elements:" halign="1" blendMode="0" position="18.472,154.849,mm" zValue="9" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="53.284,5.87319,mm" positionOnPage="18.472,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" labelText="Description:" halign="1" blendMode="0" position="18.4712,213.104,mm" zValue="8" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="20.5677,5.87319,mm" positionOnPage="18.4712,213.104,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" labelText="Priority:  [% &quot;priority&quot; %]" halign="1" blendMode="0" position="18.4712,206.23,mm" zValue="7" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="96.1108,5.87319,mm" positionOnPage="18.4712,206.23,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" blendMode="0" position="17.603,287.775,mm" zValue="6" frameJoinStyle="miter" visibility="1" id="" size="179.614,0.746,mm" positionOnPage="17.603,287.775,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1" frame="false" sectionHeight="6.16796" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" sectionX="0" blendMode="0" position="62.9048,188.347,mm" zValue="5" frameJoinStyle="miter" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,6.16796,mm" positionOnPage="62.9048,188.347,mm" itemRotation="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1" frame="false" sectionHeight="5.9" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" sectionX="0" blendMode="0" position="62.9048,182.447,mm" zValue="4" frameJoinStyle="miter" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,5.9,mm" positionOnPage="62.9048,182.447,mm" itemRotation="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" blendMode="0" position="17.7113,33.9068,mm" zValue="3" frameJoinStyle="miter" visibility="1" id="" size="178.865,0.746323,mm" positionOnPage="17.7113,33.9068,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1" frame="true" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" labelText="" halign="4" blendMode="0" position="85.0548,26.9871,mm" zValue="2" marginX="0" frameJoinStyle="miter" visibility="1" id="title" htmlState="0" valign="32" size="49.4242,4.61973,mm" positionOnPage="85.0548,26.9871,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="false" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" mapFlags="0" blendMode="0" position="18.572,40.2423,mm" zValue="1" frameJoinStyle="miter" visibility="1" followPreset="false" id="map" size="177.676,98.3225,mm" keepLayerSet="false" positionOnPage="18.572,40.2423,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapAtlasMargin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapAtlasMargin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;rotation&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;scale&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4576677.90777442045509815" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymin="4576604.16589934565126896"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -38558,198 +39317,198 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.2" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.5" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" sortAscending="1" featureFilter=" &quot;psector_id&quot; " filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="1" sortFeatures="1" pageNameExpression="" enabled="0" sortKey="psector_id"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>
diff --git a/templates/qgisproject/en/ws_om.qgs b/templates/qgisproject/en/ws_om.qgs
index 635175250..f86f1bf4e 100644
--- a/templates/qgisproject/en/ws_om.qgs
+++ b/templates/qgisproject/en/ws_om.qgs
@@ -20,109 +20,109 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="O&amp;M" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="O&amp;M">
       <customproperties/>
-      <layer-tree-layer name="Visits" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_om_visit20180201113951439" providerKey="postgres">
+      <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_om_visit&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_om_visit20180201113951439" name="Visits" providerKey="postgres">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group name="Mincut analysis" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Mincut analysis">
         <customproperties/>
-        <layer-tree-layer name="Mincut init point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut&quot; (anl_the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" name="Mincut init point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_valve&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" name="Mincut result node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" name="Mincut result connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Mincut result valve" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_om_mincut_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" name="Mincut result valve" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="INVENTORY" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="INVENTORY">
       <customproperties/>
-      <layer-tree-group name="Map zones" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Map zones">
         <customproperties/>
-        <layer-tree-layer name="Exploitation" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='expl_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_exploitation&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" name="Exploitation" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dma" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dma20190515092620863" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dma_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dma&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dma20190515092620863" name="Dma" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_sector20171204170540567" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_sector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_sector20171204170540567" name="Sector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Dqa" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='dqa_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dqa&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" name="Dqa" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Presszone" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__  sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_presszone&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" name="Presszone" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Minsector" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_minsector&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" name="Minsector" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-group name="Network" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Network">
         <customproperties/>
-        <layer-tree-layer name="Node" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_node&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" name="Node" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Arc" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_arc&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" name="Arc" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Connec" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='connec_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_connec&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" name="Connec" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Link" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_edit_link20160511142132204" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='link_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_link&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_link20160511142132204" name="Link" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-group name="Polygon GROUP" checked="Qt::Checked" expanded="0">
+        <layer-tree-group expanded="0" checked="Qt::Checked" name="Polygon GROUP">
           <customproperties/>
-          <layer-tree-layer name="Fountain polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_fountain&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" name="Fountain polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Register polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_register&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" name="Register polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer name="Tank polygon" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" providerKey="postgres">
+          <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='pol_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ve_pol_tank&quot; (the_geom) sql=" checked="Qt::Checked" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" name="Tank polygon" providerKey="postgres">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
       </layer-tree-group>
-      <layer-tree-group name="Other" checked="Qt::Checked" expanded="0">
+      <layer-tree-group expanded="0" checked="Qt::Checked" name="Other">
         <customproperties/>
-        <layer-tree-layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" expanded="0" id="v_edit_dimensions20170628134034849" providerKey="postgres">
+        <layer-tree-layer expanded="0" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" checked="Qt::Checked" id="v_edit_dimensions20170628134034849" name="Dimensioning" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Element" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_element20170828122555146" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_element&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_element20170828122555146" name="Element" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_edit_samplepoint20170619120830016" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_edit_samplepoint20170619120830016" name="Sample point" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
     </layer-tree-group>
-    <layer-tree-group name="BASEMAP" checked="Qt::Checked" expanded="0">
+    <layer-tree-group expanded="0" checked="Qt::Checked" name="BASEMAP">
       <customproperties/>
-      <layer-tree-group name="Address" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Address">
         <customproperties/>
-        <layer-tree-layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="ext_municipality20171204170633784" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" checked="Qt::Checked" id="ext_municipality20171204170633784" name="Municipality" providerKey="postgres">
           <customproperties>
             <property key="overview" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" expanded="1" id="v_ext_address20180201103159332" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" checked="Qt::Unchecked" id="v_ext_address20180201103159332" name="Address" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Streetaxis" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiLineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_streetaxis&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" name="Streetaxis" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
-        <layer-tree-layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" expanded="1" id="v_ext_plot20180201103159443" providerKey="postgres">
+        <layer-tree-layer expanded="1" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" checked="Qt::Checked" id="v_ext_plot20180201103159443" name="Plot" providerKey="postgres">
           <customproperties/>
         </layer-tree-layer>
       </layer-tree-group>
@@ -157,34 +157,34 @@
       <item>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" unit="1" enabled="1" type="1" tolerance="15" mode="3">
+  <snapping-settings tolerance="15" type="1" enabled="1" mode="3" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting units="1" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_ext_plot20180201103159443" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="v_edit_dimensions20170628134034849" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_edit_dma20190515092620863" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_samplepoint20170619120830016" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_sector20171204170540567" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_ext_address20180201103159332" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_om_visit20180201113951439" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_link20160511142132204" enabled="1" type="2" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_element20170828122555146" enabled="1" type="1" tolerance="15"/>
-      <layer-setting units="1" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="0" id="ext_municipality20171204170633784" enabled="1" type="1" tolerance="1"/>
-      <layer-setting units="1" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" enabled="0" type="1" tolerance="12"/>
-      <layer-setting units="1" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" enabled="0" type="1" tolerance="12"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_om_visit20180201113951439" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_plot20180201103159443" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_element20170828122555146" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" units="1"/>
+      <layer-setting tolerance="15" type="2" enabled="1" id="v_edit_link20160511142132204" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="ext_municipality20171204170633784" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_sector20171204170540567" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" units="1"/>
+      <layer-setting tolerance="1" type="1" enabled="1" id="v_edit_dimensions20170628134034849" units="0"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_ext_address20180201103159332" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_samplepoint20170619120830016" units="1"/>
+      <layer-setting tolerance="15" type="1" enabled="1" id="v_edit_dma20190515092620863" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" units="1"/>
+      <layer-setting tolerance="12" type="1" enabled="0" id="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -215,149 +215,149 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" name="O&amp;M" checked="Qt::Checked">
-      <legendlayer open="true" showFeatureCount="0" name="Visits" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="O&amp;M" open="false">
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Visits" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" layerid="v_edit_om_visit20180201113951439" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="false" name="Mincut analysis" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Mincut init point" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Mincut analysis" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut init point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result node" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result connec" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Mincut result valve" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Mincut result valve" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="true" name="INVENTORY" checked="Qt::Checked">
-      <legendgroup open="false" name="Map zones" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Exploitation" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="INVENTORY" open="true">
+      <legendgroup checked="Qt::Checked" name="Map zones" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Exploitation" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dma" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dma" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dma20190515092620863" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Sector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sector" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_sector20171204170540567" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Dqa" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Dqa" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_dqa_4e695ade_c45c_4562_afb6_1d3c41532a1b" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Presszone" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Presszone" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="0" layerid="v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Minsector" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Minsector" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendgroup open="true" name="Network" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Node" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Network" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Node" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Arc" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Arc" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="false" showFeatureCount="0" name="Connec" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Connec" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_connec_decaeb94_529d_4842_9e89_33c065483403" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Link" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Link" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_edit_link20160511142132204" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendgroup open="false" name="Polygon GROUP" checked="Qt::Checked">
-          <legendlayer open="true" showFeatureCount="0" name="Fountain polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+        <legendgroup checked="Qt::Checked" name="Polygon GROUP" open="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Fountain polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_fountain_24a897d1_8e54_4bc7_a70c_1c78ef7f962d" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Register polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Register polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_register_27a59a04_7d52_42b7_a514_a3a4348f26b8" isInOverview="0"/>
             </filegroup>
           </legendlayer>
-          <legendlayer open="true" showFeatureCount="0" name="Tank polygon" checked="Qt::Checked" drawingOrder="-1">
-            <filegroup open="true" hidden="false">
+          <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Tank polygon" open="true">
+            <filegroup hidden="false" open="true">
               <legendlayerfile visible="1" layerid="ve_pol_tank_4814d06a_cf6a_425a_9cc4_cf6f09a16315" isInOverview="0"/>
             </filegroup>
           </legendlayer>
         </legendgroup>
       </legendgroup>
-      <legendgroup open="false" name="Other" checked="Qt::Checked">
-        <legendlayer open="false" showFeatureCount="0" name="Dimensioning" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="false" hidden="false">
+      <legendgroup checked="Qt::Checked" name="Other" open="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Dimensioning" open="false">
+          <filegroup hidden="false" open="false">
             <legendlayerfile visible="1" layerid="v_edit_dimensions20170628134034849" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Element" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Element" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_element20170828122555146" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Sample point" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Sample point" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_edit_samplepoint20170619120830016" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
     </legendgroup>
-    <legendgroup open="false" name="BASEMAP" checked="Qt::Checked">
-      <legendgroup open="true" name="Address" checked="Qt::Checked">
-        <legendlayer open="true" showFeatureCount="0" name="Municipality" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="BASEMAP" open="false">
+      <legendgroup checked="Qt::Checked" name="Address" open="true">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Municipality" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="ext_municipality20171204170633784" isInOverview="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Address" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" name="Address" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="0" layerid="v_ext_address20180201103159332" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Streetaxis" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Streetaxis" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7" isInOverview="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" showFeatureCount="0" name="Plot" checked="Qt::Checked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" name="Plot" open="true">
+          <filegroup hidden="false" open="true">
             <legendlayerfile visible="1" layerid="v_ext_plot20180201103159443" isInOverview="0"/>
           </filegroup>
         </legendlayer>
@@ -367,7 +367,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -426,7 +426,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -450,26 +450,26 @@
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="44,122,211,0"/>
-              <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="129,10,78,255"/>
-              <prop k="outline_style" v="dot"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="44,122,211,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="129,10,78,255" k="outline_color"/>
+              <prop v="dot" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -487,56 +487,68 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="muni_id">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="observ">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="active">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -550,34 +562,34 @@
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="active" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="active" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="muni_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="active" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="muni_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="active" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="active" desc="" exp=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="active" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="183" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="active" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="183" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="active"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -609,10 +621,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="active"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="observ"/>
+        <field name="active" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="observ" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="active"/>
@@ -624,7 +636,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -683,7 +695,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -707,118 +719,118 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{29dced10-8911-4fe9-a8e3-e4eaa2961a4a}">
-          <rule label="Obsolete" key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" symbol="0"/>
-          <rule label="On service" key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" symbol="1"/>
-          <rule label="Planified" key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" symbol="2"/>
-          <rule label="Varc" key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " symbol="3"/>
+          <rule key="{d19f8c69-564f-4aca-bc02-8b8cf8cbbad7}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 0" label="Obsolete" symbol="0"/>
+          <rule key="{9ba6fe8e-f0ab-40de-bd32-b3c5cea47c45}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 1" label="On service" symbol="1"/>
+          <rule key="{8606d86b-78a8-46d8-af58-9f6eb6e84c5e}" filter=" &quot;sys_type&quot; = 'PIPE' AND &quot;state&quot; = 2" label="Planified" symbol="2"/>
+          <rule key="{8660f1b2-6f22-49c1-9e71-6aed213976e6}" filter=" &quot;sys_type&quot; = 'VARC' " label="Varc" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="227,61,39,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="227,61,39,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="31,120,180,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="31,120,180,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="230,186,68,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="230,186,68,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="129,10,78,255"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.46"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="129,10,78,255" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -827,79 +839,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="arccat_id">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="243,166,178,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="arccat_id" fontSize="8" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="243,166,178,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placementFlags="10" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="1" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="1000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="0" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MM" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="1000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="1" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="0" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -913,21 +925,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1058,6 +1070,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -1128,6 +1147,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -1142,6 +1168,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="dqa_id">
           <editWidget type="Range">
             <config>
@@ -1149,6 +1182,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -1436,6 +1476,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="depth">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="arc_id" name="" index="0"/>
@@ -1456,364 +1531,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="15"/>
         <alias field="macroexpl_id" name="" index="16"/>
         <alias field="sector_id" name="" index="17"/>
-        <alias field="macrosector_id" name="" index="18"/>
-        <alias field="state" name="" index="19"/>
-        <alias field="state_type" name="" index="20"/>
-        <alias field="annotation" name="" index="21"/>
-        <alias field="observ" name="" index="22"/>
-        <alias field="comment" name="" index="23"/>
-        <alias field="gis_length" name="" index="24"/>
-        <alias field="custom_length" name="" index="25"/>
-        <alias field="minsector_id" name="" index="26"/>
-        <alias field="dma_id" name="" index="27"/>
-        <alias field="macrodma_id" name="" index="28"/>
-        <alias field="presszone_id" name="" index="29"/>
-        <alias field="dqa_id" name="" index="30"/>
-        <alias field="macrodqa_id" name="" index="31"/>
-        <alias field="soilcat_id" name="" index="32"/>
-        <alias field="function_type" name="" index="33"/>
-        <alias field="category_type" name="" index="34"/>
-        <alias field="fluid_type" name="" index="35"/>
-        <alias field="location_type" name="" index="36"/>
-        <alias field="workcat_id" name="" index="37"/>
-        <alias field="workcat_id_end" name="" index="38"/>
-        <alias field="buildercat_id" name="" index="39"/>
-        <alias field="builtdate" name="" index="40"/>
-        <alias field="enddate" name="" index="41"/>
-        <alias field="ownercat_id" name="" index="42"/>
-        <alias field="muni_id" name="" index="43"/>
-        <alias field="postcode" name="" index="44"/>
-        <alias field="district_id" name="" index="45"/>
-        <alias field="streetname" name="" index="46"/>
-        <alias field="postnumber" name="" index="47"/>
-        <alias field="postcomplement" name="" index="48"/>
-        <alias field="streetname2" name="" index="49"/>
-        <alias field="postnumber2" name="" index="50"/>
-        <alias field="postcomplement2" name="" index="51"/>
-        <alias field="descript" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="cat_arctype_id" name="" index="63"/>
-        <alias field="nodetype_1" name="" index="64"/>
-        <alias field="staticpress1" name="" index="65"/>
-        <alias field="nodetype_2" name="" index="66"/>
-        <alias field="staticpress2" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="18"/>
+        <alias field="macrosector_id" name="" index="19"/>
+        <alias field="state" name="" index="20"/>
+        <alias field="state_type" name="" index="21"/>
+        <alias field="annotation" name="" index="22"/>
+        <alias field="observ" name="" index="23"/>
+        <alias field="comment" name="" index="24"/>
+        <alias field="gis_length" name="" index="25"/>
+        <alias field="custom_length" name="" index="26"/>
+        <alias field="minsector_id" name="" index="27"/>
+        <alias field="dma_id" name="" index="28"/>
+        <alias field="dma_name" name="" index="29"/>
+        <alias field="macrodma_id" name="" index="30"/>
+        <alias field="presszone_id" name="" index="31"/>
+        <alias field="presszone_name" name="" index="32"/>
+        <alias field="dqa_id" name="" index="33"/>
+        <alias field="dqa_name" name="" index="34"/>
+        <alias field="macrodqa_id" name="" index="35"/>
+        <alias field="soilcat_id" name="" index="36"/>
+        <alias field="function_type" name="" index="37"/>
+        <alias field="category_type" name="" index="38"/>
+        <alias field="fluid_type" name="" index="39"/>
+        <alias field="location_type" name="" index="40"/>
+        <alias field="workcat_id" name="" index="41"/>
+        <alias field="workcat_id_end" name="" index="42"/>
+        <alias field="buildercat_id" name="" index="43"/>
+        <alias field="builtdate" name="" index="44"/>
+        <alias field="enddate" name="" index="45"/>
+        <alias field="ownercat_id" name="" index="46"/>
+        <alias field="muni_id" name="" index="47"/>
+        <alias field="postcode" name="" index="48"/>
+        <alias field="district_id" name="" index="49"/>
+        <alias field="streetname" name="" index="50"/>
+        <alias field="postnumber" name="" index="51"/>
+        <alias field="postcomplement" name="" index="52"/>
+        <alias field="streetname2" name="" index="53"/>
+        <alias field="postnumber2" name="" index="54"/>
+        <alias field="postcomplement2" name="" index="55"/>
+        <alias field="descript" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="cat_arctype_id" name="" index="67"/>
+        <alias field="nodetype_1" name="" index="68"/>
+        <alias field="staticpress1" name="" index="69"/>
+        <alias field="nodetype_2" name="" index="70"/>
+        <alias field="staticpress2" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="depth" name="" index="76"/>
+        <alias field="adate" name="" index="77"/>
+        <alias field="adescript" name="" index="78"/>
+        <alias field="dma_style" name="" index="79"/>
+        <alias field="presszone_style" name="" index="80"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="node_1" applyOnUpdate="0" expression=""/>
-        <default field="node_2" applyOnUpdate="0" expression=""/>
-        <default field="elevation1" applyOnUpdate="0" expression=""/>
-        <default field="depth1" applyOnUpdate="0" expression=""/>
-        <default field="elevation2" applyOnUpdate="0" expression=""/>
-        <default field="depth2" applyOnUpdate="0" expression=""/>
-        <default field="arccat_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="custom_length" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="cat_arctype_id" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_1" applyOnUpdate="0" expression=""/>
-        <default field="staticpress1" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_2" applyOnUpdate="0" expression=""/>
-        <default field="staticpress2" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="node_1" expression=""/>
+        <default applyOnUpdate="0" field="node_2" expression=""/>
+        <default applyOnUpdate="0" field="elevation1" expression=""/>
+        <default applyOnUpdate="0" field="depth1" expression=""/>
+        <default applyOnUpdate="0" field="elevation2" expression=""/>
+        <default applyOnUpdate="0" field="depth2" expression=""/>
+        <default applyOnUpdate="0" field="arccat_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="custom_length" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="cat_arctype_id" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_1" expression=""/>
+        <default applyOnUpdate="0" field="staticpress1" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_2" expression=""/>
+        <default applyOnUpdate="0" field="staticpress2" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="arc_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arccat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="custom_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_arctype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress1" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpress2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="arc_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arccat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="custom_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_arctype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress1" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpress2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="node_1" desc="" exp=""/>
-        <constraint field="node_2" desc="" exp=""/>
-        <constraint field="elevation1" desc="" exp=""/>
-        <constraint field="depth1" desc="" exp=""/>
-        <constraint field="elevation2" desc="" exp=""/>
-        <constraint field="depth2" desc="" exp=""/>
-        <constraint field="arccat_id" desc="" exp=""/>
-        <constraint field="arc_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="custom_length" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="cat_arctype_id" desc="" exp=""/>
-        <constraint field="nodetype_1" desc="" exp=""/>
-        <constraint field="staticpress1" desc="" exp=""/>
-        <constraint field="nodetype_2" desc="" exp=""/>
-        <constraint field="staticpress2" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="node_1" desc=""/>
+        <constraint exp="" field="node_2" desc=""/>
+        <constraint exp="" field="elevation1" desc=""/>
+        <constraint exp="" field="depth1" desc=""/>
+        <constraint exp="" field="elevation2" desc=""/>
+        <constraint exp="" field="depth2" desc=""/>
+        <constraint exp="" field="arccat_id" desc=""/>
+        <constraint exp="" field="arc_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="custom_length" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="cat_arctype_id" desc=""/>
+        <constraint exp="" field="nodetype_1" desc=""/>
+        <constraint exp="" field="staticpress1" desc=""/>
+        <constraint exp="" field="nodetype_2" desc=""/>
+        <constraint exp="" field="staticpress2" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="node_1" hidden="0" width="-1" type="field"/>
-          <column name="node_2" hidden="0" width="-1" type="field"/>
-          <column name="elevation1" hidden="0" width="-1" type="field"/>
-          <column name="depth1" hidden="0" width="-1" type="field"/>
-          <column name="elevation2" hidden="0" width="-1" type="field"/>
-          <column name="depth2" hidden="0" width="-1" type="field"/>
-          <column name="arccat_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="custom_length" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="cat_arctype_id" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_1" hidden="0" width="-1" type="field"/>
-          <column name="staticpress1" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_2" hidden="0" width="-1" type="field"/>
-          <column name="staticpress2" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="node_1"/>
+          <column type="field" width="-1" hidden="0" name="node_2"/>
+          <column type="field" width="-1" hidden="0" name="elevation1"/>
+          <column type="field" width="-1" hidden="0" name="depth1"/>
+          <column type="field" width="-1" hidden="0" name="elevation2"/>
+          <column type="field" width="-1" hidden="0" name="depth2"/>
+          <column type="field" width="-1" hidden="0" name="arccat_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="custom_length"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="cat_arctype_id"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_1"/>
+          <column type="field" width="-1" hidden="0" name="staticpress1"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_2"/>
+          <column type="field" width="-1" hidden="0" name="staticpress2"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1845,79 +1956,79 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="arc_type"/>
-        <field editable="1" name="arccat_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_arctype_id"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="custom_length"/>
-        <field editable="1" name="depth1"/>
-        <field editable="1" name="depth2"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation1"/>
-        <field editable="1" name="elevation2"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_1"/>
-        <field editable="1" name="node_2"/>
-        <field editable="1" name="nodetype_1"/>
-        <field editable="1" name="nodetype_2"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpress1"/>
-        <field editable="1" name="staticpress2"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="arc_type" editable="1"/>
+        <field name="arccat_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_arctype_id" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="custom_length" editable="1"/>
+        <field name="depth1" editable="1"/>
+        <field name="depth2" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation1" editable="1"/>
+        <field name="elevation2" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_1" editable="1"/>
+        <field name="node_2" editable="1"/>
+        <field name="nodetype_1" editable="1"/>
+        <field name="nodetype_2" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpress1" editable="1"/>
+        <field name="staticpress2" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -1998,7 +2109,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>arc_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -2057,7 +2168,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -2081,179 +2192,179 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{cd75f41e-3b1d-443c-8148-fbc4436aa9cb}">
-          <rule label="Greentap" scalemindenom="1" key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; = 'GREENTAP'" symbol="0"/>
-          <rule label="Wjoin" scalemindenom="1" key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='WJOIN'" symbol="1"/>
-          <rule label="Tap" scalemindenom="1" key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='TAP'" symbol="2"/>
-          <rule label="Fountain" scalemindenom="1" key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemaxdenom="1500" filter=" &quot;sys_type&quot; ='FOUNTAIN'" symbol="3"/>
+          <rule key="{24b63ac0-a836-4203-bd64-161a0112ee9a}" scalemindenom="1" filter=" &quot;sys_type&quot; = 'GREENTAP'" scalemaxdenom="1500" label="Greentap" symbol="0"/>
+          <rule key="{abcdb374-fe6a-4d04-a466-31fdd93144e8}" scalemindenom="1" filter=" &quot;sys_type&quot; ='WJOIN'" scalemaxdenom="1500" label="Wjoin" symbol="1"/>
+          <rule key="{7dc90f4d-d098-491a-b817-e7ea68fc2fd6}" scalemindenom="1" filter=" &quot;sys_type&quot; ='TAP'" scalemaxdenom="1500" label="Tap" symbol="2"/>
+          <rule key="{39e4856f-0fc3-4498-8d4b-44d2851b421f}" scalemindenom="1" filter=" &quot;sys_type&quot; ='FOUNTAIN'" scalemaxdenom="1500" label="Fountain" symbol="3"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="201,246,158,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="0,0,0,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="1.6"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="201,246,158,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.6" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="49,180,227,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="49,180,227,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="49,180,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="49,180,227,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,0,0,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="31,120,180,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="31,120,180,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="44,67,207,83"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="triangle"/>
-              <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="22,0,148,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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="44,67,207,83" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="triangle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="22,0,148,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="22,0,148,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,0.20000000000000001"/>
-              <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_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="size" v="3"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="22,0,148,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2269,21 +2380,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2358,6 +2469,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -2463,6 +2581,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -2477,6 +2602,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -2491,6 +2623,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -2792,6 +2931,27 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="connec_id" name="" index="0"/>
@@ -2804,372 +2964,400 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="7"/>
         <alias field="macroexpl_id" name="" index="8"/>
         <alias field="sector_id" name="" index="9"/>
-        <alias field="macrosector_id" name="" index="10"/>
-        <alias field="customer_code" name="" index="11"/>
-        <alias field="cat_matcat_id" name="" index="12"/>
-        <alias field="cat_pnom" name="" index="13"/>
-        <alias field="cat_dnom" name="" index="14"/>
-        <alias field="connec_length" name="" index="15"/>
-        <alias field="state" name="" index="16"/>
-        <alias field="state_type" name="" index="17"/>
-        <alias field="n_hydrometer" name="" index="18"/>
-        <alias field="arc_id" name="" index="19"/>
-        <alias field="annotation" name="" index="20"/>
-        <alias field="observ" name="" index="21"/>
-        <alias field="comment" name="" index="22"/>
-        <alias field="minsector_id" name="" index="23"/>
-        <alias field="dma_id" name="" index="24"/>
-        <alias field="macrodma_id" name="" index="25"/>
-        <alias field="presszone_id" name="" index="26"/>
-        <alias field="staticpressure" name="" index="27"/>
-        <alias field="dqa_id" name="" index="28"/>
-        <alias field="macrodqa_id" name="" index="29"/>
-        <alias field="soilcat_id" name="" index="30"/>
-        <alias field="function_type" name="" index="31"/>
-        <alias field="category_type" name="" index="32"/>
-        <alias field="fluid_type" name="" index="33"/>
-        <alias field="location_type" name="" index="34"/>
-        <alias field="workcat_id" name="" index="35"/>
-        <alias field="workcat_id_end" name="" index="36"/>
-        <alias field="buildercat_id" name="" index="37"/>
-        <alias field="builtdate" name="" index="38"/>
-        <alias field="enddate" name="" index="39"/>
-        <alias field="ownercat_id" name="" index="40"/>
-        <alias field="muni_id" name="" index="41"/>
-        <alias field="postcode" name="" index="42"/>
-        <alias field="district_id" name="" index="43"/>
-        <alias field="streetname" name="" index="44"/>
-        <alias field="postnumber" name="" index="45"/>
-        <alias field="postcomplement" name="" index="46"/>
-        <alias field="streetname2" name="" index="47"/>
-        <alias field="postnumber2" name="" index="48"/>
-        <alias field="postcomplement2" name="" index="49"/>
-        <alias field="descript" name="" index="50"/>
-        <alias field="svg" name="" index="51"/>
-        <alias field="rotation" name="" index="52"/>
-        <alias field="link" name="" index="53"/>
-        <alias field="verified" name="" index="54"/>
-        <alias field="undelete" name="" index="55"/>
-        <alias field="label" name="" index="56"/>
-        <alias field="label_x" name="" index="57"/>
-        <alias field="label_y" name="" index="58"/>
-        <alias field="label_rotation" name="" index="59"/>
-        <alias field="publish" name="" index="60"/>
-        <alias field="inventory" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="connectype_id" name="" index="63"/>
-        <alias field="feature_id" name="" index="64"/>
-        <alias field="featurecat_id" name="" index="65"/>
-        <alias field="pjoint_id" name="" index="66"/>
-        <alias field="pjoint_type" name="" index="67"/>
-        <alias field="tstamp" name="" index="68"/>
-        <alias field="insert_user" name="" index="69"/>
-        <alias field="lastupdate" name="" index="70"/>
-        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="sector_name" name="" index="10"/>
+        <alias field="macrosector_id" name="" index="11"/>
+        <alias field="customer_code" name="" index="12"/>
+        <alias field="cat_matcat_id" name="" index="13"/>
+        <alias field="cat_pnom" name="" index="14"/>
+        <alias field="cat_dnom" name="" index="15"/>
+        <alias field="connec_length" name="" index="16"/>
+        <alias field="state" name="" index="17"/>
+        <alias field="state_type" name="" index="18"/>
+        <alias field="n_hydrometer" name="" index="19"/>
+        <alias field="arc_id" name="" index="20"/>
+        <alias field="annotation" name="" index="21"/>
+        <alias field="observ" name="" index="22"/>
+        <alias field="comment" name="" index="23"/>
+        <alias field="minsector_id" name="" index="24"/>
+        <alias field="dma_id" name="" index="25"/>
+        <alias field="dma_name" name="" index="26"/>
+        <alias field="macrodma_id" name="" index="27"/>
+        <alias field="presszone_id" name="" index="28"/>
+        <alias field="presszone_name" name="" index="29"/>
+        <alias field="staticpressure" name="" index="30"/>
+        <alias field="dqa_id" name="" index="31"/>
+        <alias field="dqa_name" name="" index="32"/>
+        <alias field="macrodqa_id" name="" index="33"/>
+        <alias field="soilcat_id" name="" index="34"/>
+        <alias field="function_type" name="" index="35"/>
+        <alias field="category_type" name="" index="36"/>
+        <alias field="fluid_type" name="" index="37"/>
+        <alias field="location_type" name="" index="38"/>
+        <alias field="workcat_id" name="" index="39"/>
+        <alias field="workcat_id_end" name="" index="40"/>
+        <alias field="buildercat_id" name="" index="41"/>
+        <alias field="builtdate" name="" index="42"/>
+        <alias field="enddate" name="" index="43"/>
+        <alias field="ownercat_id" name="" index="44"/>
+        <alias field="muni_id" name="" index="45"/>
+        <alias field="postcode" name="" index="46"/>
+        <alias field="district_id" name="" index="47"/>
+        <alias field="streetname" name="" index="48"/>
+        <alias field="postnumber" name="" index="49"/>
+        <alias field="postcomplement" name="" index="50"/>
+        <alias field="streetname2" name="" index="51"/>
+        <alias field="postnumber2" name="" index="52"/>
+        <alias field="postcomplement2" name="" index="53"/>
+        <alias field="descript" name="" index="54"/>
+        <alias field="svg" name="" index="55"/>
+        <alias field="rotation" name="" index="56"/>
+        <alias field="link" name="" index="57"/>
+        <alias field="verified" name="" index="58"/>
+        <alias field="undelete" name="" index="59"/>
+        <alias field="label" name="" index="60"/>
+        <alias field="label_x" name="" index="61"/>
+        <alias field="label_y" name="" index="62"/>
+        <alias field="label_rotation" name="" index="63"/>
+        <alias field="publish" name="" index="64"/>
+        <alias field="inventory" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="connectype_id" name="" index="67"/>
+        <alias field="feature_id" name="" index="68"/>
+        <alias field="featurecat_id" name="" index="69"/>
+        <alias field="pjoint_id" name="" index="70"/>
+        <alias field="pjoint_type" name="" index="71"/>
+        <alias field="tstamp" name="" index="72"/>
+        <alias field="insert_user" name="" index="73"/>
+        <alias field="lastupdate" name="" index="74"/>
+        <alias field="lastupdate_user" name="" index="75"/>
+        <alias field="adate" name="" index="76"/>
+        <alias field="adescript" name="" index="77"/>
+        <alias field="accessibility" name="" index="78"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="connec_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="connecat_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="connec_length" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="n_hydrometer" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="connectype_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_id" applyOnUpdate="0" expression=""/>
-        <default field="pjoint_type" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="connec_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="connecat_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="connec_length" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="n_hydrometer" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="connectype_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_id" expression=""/>
+        <default applyOnUpdate="0" field="pjoint_type" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="connec_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="n_hydrometer" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connectype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pjoint_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="connec_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="n_hydrometer" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connectype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pjoint_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="connec_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="connecat_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="connec_length" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="n_hydrometer" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="connectype_id" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="pjoint_id" desc="" exp=""/>
-        <constraint field="pjoint_type" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="connec_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="connecat_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="connec_length" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="n_hydrometer" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="connectype_id" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="pjoint_id" desc=""/>
+        <constraint exp="" field="pjoint_type" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="connec_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="connecat_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="connec_length" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="n_hydrometer" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="connectype_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_id" hidden="0" width="-1" type="field"/>
-          <column name="pjoint_type" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="connec_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="connecat_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="connec_length"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="n_hydrometer"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="connectype_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_id"/>
+          <column type="field" width="-1" hidden="0" name="pjoint_type"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3201,78 +3389,78 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="connec_length"/>
-        <field editable="1" name="connec_type"/>
-        <field editable="1" name="connecat_id"/>
-        <field editable="1" name="connectype_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="n_hydrometer"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="pjoint_id"/>
-        <field editable="1" name="pjoint_type"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="connec_id" editable="1"/>
+        <field name="connec_length" editable="1"/>
+        <field name="connec_type" editable="1"/>
+        <field name="connecat_id" editable="1"/>
+        <field name="connectype_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="n_hydrometer" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pjoint_id" editable="1"/>
+        <field name="pjoint_type" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -3352,7 +3540,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Line" refreshOnNotifyMessage="">
       <id>v_edit_dimensions20170628134034849</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) sql=</datasource>
       <keywordList>
@@ -3405,7 +3593,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -3429,586 +3617,586 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-          <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-          <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-          <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+          <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+          <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+          <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.2"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="line"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="line" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="lastvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="lastvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="180"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="180" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot;"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot;"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="firstvertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="firstvertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="arrowhead"/>
-                  <prop k="offset" v="0,-0.00000000000000006"/>
-                  <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="solid"/>
-                  <prop k="outline_width" v="0.2"/>
-                  <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="3"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@1@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="0,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="arrowhead" k="name"/>
+                  <prop v="0,-0.00000000000000006" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.2" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="3" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="66,66,66,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="66,66,66,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="placement" v="vertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
+              <prop v="4" k="average_angle_length"/>
+              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
+              <prop v="MM" k="average_angle_unit"/>
+              <prop v="3" k="interval"/>
+              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
+              <prop v="MM" k="interval_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="0" k="offset_along_line"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+              <prop v="MM" k="offset_along_line_unit"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="vertex" k="placement"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="142,139,143,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="0,0,0,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="0.8"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MapUnit"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@2@2" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="142,139,143,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="0.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MapUnit" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="angle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="expression" type="QString" value="&quot;arrow&quot; +180"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="angle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="expression" value="&quot;arrow&quot; +180"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Fill"/>
-              <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Fill" k="SymbolType"/>
+              <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-                <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,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="solid"/>
-                  <prop k="outline_width" v="0.26"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
+              <symbol type="fill" alpha="1" force_rhr="0" name="@2@3" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0,0,0,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0.26" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Line"/>
-              <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Line" k="SymbolType"/>
+              <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@4" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-                <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="line_color" v="0,0,0,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="use_custom_dash" v="0"/>
-                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <symbol type="line" alpha="1" force_rhr="0" name="@2@4" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                  <prop v="square" k="capstyle"/>
+                  <prop v="5;2" k="customdash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                  <prop v="MM" k="customdash_unit"/>
+                  <prop v="0" k="draw_inside_polygon"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0,0,255" k="line_color"/>
+                  <prop v="solid" k="line_style"/>
+                  <prop v="0.26" k="line_width"/>
+                  <prop v="MM" k="line_width_unit"/>
+                  <prop v="0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="0" k="ring_filter"/>
+                  <prop v="0" k="use_custom_dash"/>
+                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -4018,611 +4206,611 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{74777ea6-8280-4b30-9d5d-ddfc8e15789c}">
-          <rule scalemindenom="1" key="{71b5aaec-40fd-4662-8517-9923eacd5e99}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+        <rules key="{0369871f-63a5-40a4-ae2f-00043bff425a}">
+          <rule key="{29fd5ec4-6946-4efb-8fa9-02c57b8a6d45}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{fe194235-4b3d-4c5a-8300-a965ee4d5747}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+          <rule key="{9919e162-0032-43c4-8595-afcad5f69067}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{7ad26b02-f98e-4207-9c58-9e9e77bb8a73}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+          <rule key="{803fae95-fa81-4cb3-8a27-2b9682f9f287}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{ae124479-1276-45fe-bdf2-d29b6727846a}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+          <rule key="{808a14e3-8721-4ae6-a348-fb23f830d339}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="1" key="{750be282-d4cc-4137-9551-e68430260327}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+          <rule key="{3faddbb7-1296-4ac7-8914-d0d8326804f8}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="LabelRotation" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="LabelRotation">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="x_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="x_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="y_label"/>
-                        <Option name="type" type="int" value="2"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="y_label"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="1" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MapUnit" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="1" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="LabelRotation" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="360 - (&quot;rotation_label&quot;)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="LabelRotation">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="360 - (&quot;rotation_label&quot;)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="x_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="x_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="y_label"/>
-                      <Option name="type" type="int" value="2"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="y_label"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{4e5f4e3a-8d46-403d-bd4b-61b499c668de}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+          <rule key="{123e6cc1-67da-4982-9768-08141005d60b}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{b85be372-a521-4761-8d8b-90d588598a6b}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+          <rule key="{32da8db9-3653-471f-ac1f-67d19678d38a}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot;  - 2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot;  - 2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule scalemindenom="600" key="{0dc8a389-0c65-4c3c-9260-2c8771e38a03}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+          <rule key="{4df0730a-9e78-4916-a974-7c2237090e19}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
             <settings calloutType="simple">
-              <text-style namedStyle="Light" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="MapUnit" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="'-' || '&amp;' || '()'">
-                <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-                <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+              <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" fontSizeUnit="MapUnit" textOrientation="horizontal" textColor="0,0,0,255" isExpression="1" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="25" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+                <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1"/>
+                <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" wrapChar="&amp;" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="1" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-              <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="4" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="UnknownGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-              <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+              <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="UnknownGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="4" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+              <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;x_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;x_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="&quot;y_symbol&quot; -2.5"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;y_symbol&quot; -2.5"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -4778,27 +4966,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4807,8 +4995,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4817,8 +5005,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4827,8 +5015,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4837,16 +5025,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_label">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -4854,8 +5045,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4864,8 +5055,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4874,23 +5065,29 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="x_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="y_symbol">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -4898,8 +5095,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4908,34 +5105,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -4944,16 +5135,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="comment">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -4979,81 +5173,82 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="x_label" applyOnUpdate="0" expression=""/>
-        <default field="y_label" applyOnUpdate="0" expression=""/>
-        <default field="rotation_label" applyOnUpdate="0" expression=""/>
-        <default field="offset_label" applyOnUpdate="0" expression=""/>
-        <default field="direction_arrow" applyOnUpdate="0" expression=""/>
-        <default field="x_symbol" applyOnUpdate="0" expression=""/>
-        <default field="y_symbol" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="x_label" expression=""/>
+        <default applyOnUpdate="0" field="y_label" expression=""/>
+        <default applyOnUpdate="0" field="rotation_label" expression=""/>
+        <default applyOnUpdate="0" field="offset_label" expression=""/>
+        <default applyOnUpdate="0" field="direction_arrow" expression=""/>
+        <default applyOnUpdate="0" field="x_symbol" expression=""/>
+        <default applyOnUpdate="0" field="y_symbol" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="offset_label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="direction_arrow" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="x_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="y_symbol" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="offset_label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="direction_arrow" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="x_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="y_symbol" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="x_label" desc="" exp=""/>
-        <constraint field="y_label" desc="" exp=""/>
-        <constraint field="rotation_label" desc="" exp=""/>
-        <constraint field="offset_label" desc="" exp=""/>
-        <constraint field="direction_arrow" desc="" exp=""/>
-        <constraint field="x_symbol" desc="" exp=""/>
-        <constraint field="y_symbol" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="x_label" desc=""/>
+        <constraint exp="" field="y_label" desc=""/>
+        <constraint exp="" field="rotation_label" desc=""/>
+        <constraint exp="" field="offset_label" desc=""/>
+        <constraint exp="" field="direction_arrow" desc=""/>
+        <constraint exp="" field="x_symbol" desc=""/>
+        <constraint exp="" field="y_symbol" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="x_label" hidden="0" width="-1" type="field"/>
-          <column name="y_label" hidden="0" width="-1" type="field"/>
-          <column name="rotation_label" hidden="0" width="-1" type="field"/>
-          <column name="offset_label" hidden="0" width="-1" type="field"/>
-          <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-          <column name="x_symbol" hidden="0" width="-1" type="field"/>
-          <column name="y_symbol" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="distance"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="x_label"/>
+          <column type="field" width="-1" hidden="0" name="y_label"/>
+          <column type="field" width="-1" hidden="0" name="rotation_label"/>
+          <column type="field" width="-1" hidden="0" name="offset_label"/>
+          <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+          <column type="field" width="-1" hidden="0" name="x_symbol"/>
+          <column type="field" width="-1" hidden="0" name="y_symbol"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5085,24 +5280,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="direction_arrow"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="offset_label"/>
-        <field editable="1" name="rotation_label"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="x_label"/>
-        <field editable="1" name="x_symbol"/>
-        <field editable="1" name="y_label"/>
-        <field editable="1" name="y_symbol"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="direction_arrow" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="offset_label" editable="1"/>
+        <field name="rotation_label" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="x_label" editable="1"/>
+        <field name="x_symbol" editable="1"/>
+        <field name="y_label" editable="1"/>
+        <field name="y_symbol" editable="1"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="depth"/>
         <field labelOnTop="0" name="direction_arrow"/>
         <field labelOnTop="0" name="distance"/>
@@ -5123,7 +5319,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -5182,7 +5378,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -5206,145 +5402,145 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dma1-1d" value="dma1-1d" symbol="0"/>
-          <category render="true" label="dma1-2d" value="dma1-2d" symbol="1"/>
-          <category render="true" label="dma2-1d" value="dma2-1d" symbol="2"/>
-          <category render="true" label="source-1" value="source-1" symbol="3"/>
-          <category render="true" label="source-2" value="source-2" symbol="4"/>
+          <category render="true" value="dma1-1d" label="dma1-1d" symbol="0"/>
+          <category render="true" value="dma1-2d" label="dma1-2d" symbol="1"/>
+          <category render="true" value="dma2-1d" label="dma2-1d" symbol="2"/>
+          <category render="true" value="source-1" label="source-1" symbol="3"/>
+          <category render="true" value="source-2" label="source-2" symbol="4"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="189,83,201,103"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="189,83,201,103" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="201,58,45,106"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="201,58,45,106" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="107,234,171,108"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="107,234,171,108" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="62,113,230,107"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="62,113,230,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="176,226,48,100"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="176,226,48,100" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="8,48,107,123"/>
-              <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="12,12,12,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="8,48,107,123" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="12,12,12,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5362,27 +5558,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="dma_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="dma_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5391,8 +5587,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5401,8 +5597,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5411,8 +5607,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5421,8 +5617,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5431,8 +5627,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5441,8 +5637,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5451,8 +5647,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5461,8 +5657,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5471,8 +5667,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5481,8 +5677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5491,8 +5687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5501,8 +5697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5533,74 +5729,74 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="minc" applyOnUpdate="0" expression=""/>
-        <default field="maxc" applyOnUpdate="0" expression=""/>
-        <default field="effc" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="minc" expression=""/>
+        <default applyOnUpdate="0" field="maxc" expression=""/>
+        <default applyOnUpdate="0" field="effc" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dma_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="maxc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="effc" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dma_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="maxc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="effc" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="minc" desc="" exp=""/>
-        <constraint field="maxc" desc="" exp=""/>
-        <constraint field="effc" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="minc" desc=""/>
+        <constraint exp="" field="maxc" desc=""/>
+        <constraint exp="" field="effc" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-        <actionsetting isEnabledOnlyWhenEditable="0" name="History aSCHEMA_NAMEit" shortTitle="" icon="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" notificationMessage="" id="{be5d940b-02fd-451d-a305-acaddf30c925}" type="1" capture="0">
+        <actionsetting notificationMessage="" action="qgis.utils.plugins['postgres91plusaSCHEMA_NAMEitor'].aSCHEMA_NAMEit('dma20151127113007431',[% $id %])" capture="0" type="1" icon="" isEnabledOnlyWhenEditable="0" shortTitle="" name="History aSCHEMA_NAMEit" id="{be5d940b-02fd-451d-a305-acaddf30c925}">
+          <actionScope id="Field"/>
           <actionScope id="Canvas"/>
           <actionScope id="Feature"/>
-          <actionScope id="Field"/>
         </actionsetting>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="176" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="minc" hidden="0" width="-1" type="field"/>
-          <column name="maxc" hidden="0" width="-1" type="field"/>
-          <column name="effc" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="176" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="minc"/>
+          <column type="field" width="-1" hidden="0" name="maxc"/>
+          <column type="field" width="-1" hidden="0" name="effc"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5632,18 +5828,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="effc"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="maxc"/>
-        <field editable="1" name="minc"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="effc" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="maxc" editable="1"/>
+        <field name="minc" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -5663,7 +5859,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -5722,7 +5918,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -5746,122 +5942,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="dqa1-1d" value="dqa1-1d" symbol="0"/>
-          <category render="true" label="dqa1-1s" value="dqa1-1s" symbol="1"/>
-          <category render="true" label="dqa2-1d" value="dqa2-1d" symbol="2"/>
-          <category render="true" label="dqa2-1s" value="dqa2-1s" symbol="3"/>
+          <category render="true" value="dqa1-1d" label="dqa1-1d" symbol="0"/>
+          <category render="true" value="dqa1-1s" label="dqa1-1s" symbol="1"/>
+          <category render="true" value="dqa2-1d" label="dqa2-1d" symbol="2"/>
+          <category render="true" value="dqa2-1s" label="dqa2-1s" symbol="3"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="221,206,106,96"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="221,206,106,96" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="171,92,213,107"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="171,92,213,107" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="82,227,176,97"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="82,227,176,97" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="232,74,77,84"/>
-              <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,5,100,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="232,74,77,84" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,5,100,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="231,113,72,0"/>
-              <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="8,17,192,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.5"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="231,113,72,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="8,17,192,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.5" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5884,21 +6080,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5907,8 +6103,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5917,8 +6113,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5927,8 +6123,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5937,8 +6133,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5947,8 +6143,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5957,8 +6153,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5967,8 +6163,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5977,8 +6173,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5987,8 +6183,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -5997,8 +6193,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6027,61 +6223,61 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="pattern_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_type" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="pattern_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_type" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="dqa_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="pattern_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="dqa_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pattern_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="pattern_id" desc="" exp=""/>
-        <constraint field="dqa_type" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="pattern_id" desc=""/>
+        <constraint exp="" field="dqa_type" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="pattern_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_type" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="pattern_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_type"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6113,17 +6309,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="dqa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="nodeparent"/>
-        <field editable="1" name="pattern_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="dqa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="nodeparent" editable="1"/>
+        <field name="pattern_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -6142,13 +6338,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
-      <extent>
-        <xmin>__XMIN__</xmin>
-        <ymin>__YMIN__</ymin>
-        <xmax>__XMAX__</xmax>
-        <ymax>__YMAX__</ymax>
-      </extent>
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_element20170828122555146</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) sql=</datasource>
       <keywordList>
@@ -6201,7 +6391,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -6225,33 +6415,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="134,48,135,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="134,48,135,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6269,21 +6459,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6291,21 +6481,30 @@ def my_form_open(dialog, layer, feature):
         <field name="element_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="elementcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6313,8 +6512,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6323,41 +6522,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="CANCELED FICTICIOUS" type="QString" value="95"/>
-                  <Option name="CANCELED PLANIFIED" type="QString" value="96"/>
-                  <Option name="DONE FICTICIOUS" type="QString" value="97"/>
-                  <Option name="DONE PLANIFIED" type="QString" value="98"/>
-                  <Option name="FICTICIUS" type="QString" value="99"/>
-                  <Option name="OBSOLETE" type="QString" value="1"/>
-                  <Option name="ON_SERVICE" type="QString" value="2"/>
-                  <Option name="PLANIFIED" type="QString" value="3"/>
-                  <Option name="PROVISIONAL" type="QString" value="5"/>
-                  <Option name="RECONSTRUCT" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6366,8 +6552,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6376,8 +6562,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6386,8 +6572,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6395,42 +6581,39 @@ def my_form_open(dialog, layer, feature):
         <field name="function_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="category_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Category" type="QString" value="Standard Category"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="location_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Location" type="QString" value="Standard Location"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="Standard Fluid" type="QString" value="Standard Fluid"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6438,27 +6621,29 @@ def my_form_open(dialog, layer, feature):
         <field name="workcat_id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="buildercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="builder1" type="QString" value="builder1"/>
-                  <Option name="builder2" type="QString" value="builder2"/>
-                  <Option name="builder3" type="QString" value="builder3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6467,8 +6652,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6477,22 +6662,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="ownercat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="owner1" type="QString" value="owner1"/>
-                  <Option name="owner2" type="QString" value="owner2"/>
-                  <Option name="owner3" type="QString" value="owner3"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6501,8 +6682,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6511,21 +6692,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6534,8 +6712,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6544,8 +6722,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6554,8 +6732,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6564,16 +6742,19 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="inventory">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -6581,21 +6762,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="pol_id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6632,142 +6820,147 @@ def my_form_open(dialog, layer, feature):
         <alias field="inventory" name="inventory" index="27"/>
         <alias field="undelete" name="undelete" index="28"/>
         <alias field="expl_id" name="Exploitation" index="29"/>
+        <alias field="pol_id" name="" index="30"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="element_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elementcat_id" applyOnUpdate="0" expression=""/>
-        <default field="elementtype_id" applyOnUpdate="0" expression=""/>
-        <default field="serial_number" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="num_elements" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="element_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elementcat_id" expression=""/>
+        <default applyOnUpdate="0" field="elementtype_id" expression=""/>
+        <default applyOnUpdate="0" field="serial_number" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="num_elements" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="element_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elementtype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="serial_number" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_elements" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="element_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elementtype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="serial_number" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_elements" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="pol_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="element_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elementcat_id" desc="" exp=""/>
-        <constraint field="elementtype_id" desc="" exp=""/>
-        <constraint field="serial_number" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="num_elements" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="element_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elementcat_id" desc=""/>
+        <constraint exp="" field="elementtype_id" desc=""/>
+        <constraint exp="" field="serial_number" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="num_elements" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="pol_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="element_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elementcat_id" hidden="0" width="-1" type="field"/>
-          <column name="serial_number" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="num_elements" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="elementtype_id" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="element_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elementcat_id"/>
+          <column type="field" width="-1" hidden="0" name="serial_number"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="num_elements"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="elementtype_id"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6799,36 +6992,37 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="element_id"/>
-        <field editable="1" name="elementcat_id"/>
-        <field editable="1" name="elementtype_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="num_elements"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="serial_number"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="element_id" editable="1"/>
+        <field name="elementcat_id" editable="1"/>
+        <field name="elementtype_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="num_elements" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="serial_number" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="buildercat_id"/>
@@ -6852,6 +7046,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="num_elements"/>
         <field labelOnTop="0" name="observ"/>
         <field labelOnTop="0" name="ownercat_id"/>
+        <field labelOnTop="0" name="pol_id"/>
         <field labelOnTop="0" name="publish"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="serial_number"/>
@@ -6873,7 +7068,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "element_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -6932,7 +7127,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -6956,26 +7151,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="28,184,189,0"/>
-              <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,128,0,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="28,184,189,0" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,128,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6993,37 +7188,43 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="-2.14748e+09" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="expl_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="expl_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <fieldConfiguration>
         <field name="expl_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7032,20 +7233,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macroexpl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Macroexploitation-1" type="QString" value="1"/>
-                  <Option name="Undefined" type="QString" value="0"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7054,23 +7253,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="undelete">
-          <editWidget type="">
+          <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="tstamp">
-          <editWidget type="">
+          <editWidget type="DateTime">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd HH:mm:ss"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7086,42 +7294,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="expl_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="1" constraints="1" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="expl_id" unique_strength="1"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="name" unique_strength="0"/>
+        <constraint constraints="1" exp_strength="0" notnull_strength="1" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="168" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="168" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7153,12 +7361,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -7172,7 +7380,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("short_descript", '&lt;NULL>')</previewExpression>
       <mapTip>short_descript</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="LineString" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7232,7 +7440,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7256,69 +7464,69 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="253,0,93,255"/>
-              <prop k="line_style" v="dot"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="square" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="253,0,93,255" k="line_color"/>
+              <prop v="dot" k="line_style"/>
+              <prop v="0.26" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="GeometryGenerator" pass="0">
-              <prop k="SymbolType" v="Marker"/>
-              <prop k="geometryModifier" v="end_point ($geometry)"/>
+            <layer enabled="1" locked="0" pass="0" class="GeometryGenerator">
+              <prop v="Marker" k="SymbolType"/>
+              <prop v="end_point ($geometry)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="255,0,0,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="cross2"/>
-                  <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="1.8"/>
-                  <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"/>
+              <symbol type="marker" alpha="1" force_rhr="0" name="@0@1" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="255,0,0,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="cross2" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="1.8" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -7338,27 +7546,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="1" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="link_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="link_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7367,24 +7575,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="feature_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7393,24 +7595,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="exit_type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ARC" type="QString" value="ARC"/>
-                  <Option name="CONNEC" type="QString" value="CONNEC"/>
-                  <Option name="ELEMENT" type="QString" value="ELEMENT"/>
-                  <Option name="LINK" type="QString" value="LINK"/>
-                  <Option name="NODE" type="QString" value="NODE"/>
-                  <Option name="VNODE" type="QString" value="VNODE"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7419,92 +7615,68 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="sector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="sector1-1d" type="QString" value="3"/>
-                  <Option name="sector1-1s" type="QString" value="1"/>
-                  <Option name="sector1-2s" type="QString" value="2"/>
-                  <Option name="sector2-1d" type="QString" value="5"/>
-                  <Option name="sector2-1s" type="QString" value="4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrosector_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrosector_01" type="QString" value="1"/>
-                  <Option name="macrosector_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7513,8 +7685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7523,8 +7695,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -7532,28 +7704,40 @@ def my_form_open(dialog, layer, feature):
         <field name="ispsectorgeom">
           <editWidget type="CheckBox">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="QString" name="CheckedState" value=""/>
+                <Option type="QString" name="UncheckedState" value=""/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="psector_rowid">
-          <editWidget type="Range">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="fluid_type">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="vnode_topelev">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -7580,86 +7764,86 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="link_id" applyOnUpdate="0" expression=""/>
-        <default field="feature_type" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="exit_type" applyOnUpdate="0" expression=""/>
-        <default field="exit_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="gis_length" applyOnUpdate="0" expression=""/>
-        <default field="userdefined_geom" applyOnUpdate="0" expression=""/>
-        <default field="ispsectorgeom" applyOnUpdate="0" expression=""/>
-        <default field="psector_rowid" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="vnode_topelev" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="link_id" expression=""/>
+        <default applyOnUpdate="0" field="feature_type" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="exit_type" expression=""/>
+        <default applyOnUpdate="0" field="exit_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="gis_length" expression=""/>
+        <default applyOnUpdate="0" field="userdefined_geom" expression=""/>
+        <default applyOnUpdate="0" field="ispsectorgeom" expression=""/>
+        <default applyOnUpdate="0" field="psector_rowid" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="vnode_topelev" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="link_id" notnull_strength="2" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exit_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="gis_length" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="userdefined_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ispsectorgeom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="psector_rowid" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="vnode_topelev" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="2" field="link_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exit_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="gis_length" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="userdefined_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ispsectorgeom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="psector_rowid" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="vnode_topelev" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="link_id" desc="" exp=""/>
-        <constraint field="feature_type" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="exit_type" desc="" exp=""/>
-        <constraint field="exit_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="gis_length" desc="" exp=""/>
-        <constraint field="userdefined_geom" desc="" exp=""/>
-        <constraint field="ispsectorgeom" desc="" exp=""/>
-        <constraint field="psector_rowid" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="vnode_topelev" desc="" exp=""/>
+        <constraint exp="" field="link_id" desc=""/>
+        <constraint exp="" field="feature_type" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="exit_type" desc=""/>
+        <constraint exp="" field="exit_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="gis_length" desc=""/>
+        <constraint exp="" field="userdefined_geom" desc=""/>
+        <constraint exp="" field="ispsectorgeom" desc=""/>
+        <constraint exp="" field="psector_rowid" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="vnode_topelev" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;sector_id&quot;">
+      <attributetableconfig sortExpression="&quot;sector_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="link_id" hidden="0" width="-1" type="field"/>
-          <column name="feature_type" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="exit_type" hidden="0" width="-1" type="field"/>
-          <column name="exit_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="gis_length" hidden="0" width="-1" type="field"/>
-          <column name="userdefined_geom" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="ispsectorgeom" hidden="0" width="-1" type="field"/>
-          <column name="psector_rowid" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="vnode_topelev" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="link_id"/>
+          <column type="field" width="-1" hidden="0" name="feature_type"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="exit_type"/>
+          <column type="field" width="-1" hidden="0" name="exit_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="gis_length"/>
+          <column type="field" width="-1" hidden="0" name="userdefined_geom"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="ispsectorgeom"/>
+          <column type="field" width="-1" hidden="0" name="psector_rowid"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="vnode_topelev"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7691,23 +7875,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="exit_id"/>
-        <field editable="1" name="exit_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="feature_type"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="gis_length"/>
-        <field editable="1" name="ispsectorgeom"/>
-        <field editable="1" name="link_id"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="psector_rowid"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="userdefined_geom"/>
-        <field editable="1" name="vnode_topelev"/>
+        <field name="dma_id" editable="1"/>
+        <field name="exit_id" editable="1"/>
+        <field name="exit_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="feature_type" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="gis_length" editable="1"/>
+        <field name="ispsectorgeom" editable="1"/>
+        <field name="link_id" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="psector_rowid" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="userdefined_geom" editable="1"/>
+        <field name="vnode_topelev" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -7732,7 +7916,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "link_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -7791,7 +7975,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -7815,989 +7999,989 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
         <rules key="{f9bd1dda-e8cb-4456-b498-a3f1312029f9}">
-          <rule label="Wtp" key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WTP'" symbol="0"/>
-          <rule label="Waterwell" key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'WATERWELL'" symbol="1"/>
-          <rule label="Source" key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'SOURCE'" symbol="2"/>
-          <rule label="Tank" key="{5d885b4a-fd95-42b2-8da9-717face5a272}" scalemaxdenom="25000" filter="&quot;sys_type&quot; = 'TANK'" symbol="3"/>
-          <rule label="Expantank" key="{eed06555-2d38-4bfe-b114-13e014b63af1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" symbol="4"/>
-          <rule label="Filter" key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FILTER'" symbol="5"/>
-          <rule label="Flexunion" key="{9f0ffeda-84af-4676-9263-119eb6042786}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'FLEXUNION'" symbol="6"/>
-          <rule label="Hydrant" key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'HYDRANT'" symbol="7"/>
-          <rule label="Meter" key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'METER'" symbol="8"/>
-          <rule label="Netelement" key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETELEMENT'" symbol="9"/>
-          <rule label="Netsamplepoint" key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" symbol="10"/>
-          <rule label="Pump" key="{01479095-8f9e-40cf-b92b-6e13874561ae}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'PUMP'" symbol="11"/>
-          <rule label="Register" key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REGISTER'" symbol="12"/>
-          <rule label="Manhole" key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'MANHOLE'" symbol="13"/>
-          <rule label="Reduction" key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'REDUCTION'" symbol="14"/>
-          <rule label="Valve" key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'VALVE'" symbol="15"/>
-          <rule label="Junction" key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" scalemaxdenom="2500" filter="&quot;sys_type&quot; = 'JUNCTION'" symbol="16"/>
-          <rule label="Netwjoin" key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" scalemaxdenom="1500" filter="&quot;sys_type&quot; = 'NETWJOIN'" symbol="17"/>
+          <rule key="{d0729bdd-7dcb-4e5d-9962-cd92c35d405e}" filter="&quot;sys_type&quot; = 'WTP'" scalemaxdenom="25000" label="Wtp" symbol="0"/>
+          <rule key="{2ecb80ea-9da6-4533-aad0-7275c5a08550}" filter="&quot;sys_type&quot; = 'WATERWELL'" scalemaxdenom="25000" label="Waterwell" symbol="1"/>
+          <rule key="{88ef1cea-1727-4681-9d7e-964bcfee179f}" filter="&quot;sys_type&quot; = 'SOURCE'" scalemaxdenom="25000" label="Source" symbol="2"/>
+          <rule key="{5d885b4a-fd95-42b2-8da9-717face5a272}" filter="&quot;sys_type&quot; = 'TANK'" scalemaxdenom="25000" label="Tank" symbol="3"/>
+          <rule key="{eed06555-2d38-4bfe-b114-13e014b63af1}" filter="&quot;sys_type&quot; = 'EXPANSIONTANK'" scalemaxdenom="2500" label="Expantank" symbol="4"/>
+          <rule key="{d2138541-5cb8-4896-b97e-494fa6df6d40}" filter="&quot;sys_type&quot; = 'FILTER'" scalemaxdenom="2500" label="Filter" symbol="5"/>
+          <rule key="{9f0ffeda-84af-4676-9263-119eb6042786}" filter="&quot;sys_type&quot; = 'FLEXUNION'" scalemaxdenom="2500" label="Flexunion" symbol="6"/>
+          <rule key="{bfe404fe-23c9-4c26-a91e-bc5e89b7203b}" filter="&quot;sys_type&quot; = 'HYDRANT'" scalemaxdenom="2500" label="Hydrant" symbol="7"/>
+          <rule key="{70f23680-8f8d-4eb8-ad9d-b6c222b1359a}" filter="&quot;sys_type&quot; = 'METER'" scalemaxdenom="2500" label="Meter" symbol="8"/>
+          <rule key="{086f2a29-0a69-4a25-9b96-9f5d9f2955c1}" filter="&quot;sys_type&quot; = 'NETELEMENT'" scalemaxdenom="2500" label="Netelement" symbol="9"/>
+          <rule key="{c0f1b0c8-34ee-4ec4-a914-97824ad2c467}" filter="&quot;sys_type&quot; = 'NETSAMPLEPOINT'" scalemaxdenom="2500" label="Netsamplepoint" symbol="10"/>
+          <rule key="{01479095-8f9e-40cf-b92b-6e13874561ae}" filter="&quot;sys_type&quot; = 'PUMP'" scalemaxdenom="2500" label="Pump" symbol="11"/>
+          <rule key="{8e1a0afb-c274-48ae-95a9-9c35583776c7}" filter="&quot;sys_type&quot; = 'REGISTER'" scalemaxdenom="2500" label="Register" symbol="12"/>
+          <rule key="{c71da5c0-8b8d-4375-839b-e3ccf0c41b56}" filter="&quot;sys_type&quot; = 'MANHOLE'" scalemaxdenom="2500" label="Manhole" symbol="13"/>
+          <rule key="{94bc6268-f342-4b79-a7f0-d8ba6498eb62}" filter="&quot;sys_type&quot; = 'REDUCTION'" scalemaxdenom="2500" label="Reduction" symbol="14"/>
+          <rule key="{d6c2b118-3f7e-4809-a8e8-e6857e5a3f87}" filter="&quot;sys_type&quot; = 'VALVE'" scalemaxdenom="2500" label="Valve" symbol="15"/>
+          <rule key="{2bb6a916-46c5-4610-b8fa-4a7a93cfe697}" filter="&quot;sys_type&quot; = 'JUNCTION'" scalemaxdenom="2500" label="Junction" symbol="16"/>
+          <rule key="{475bbd67-e8c5-496e-84cd-3f0a8b3bf35d}" filter="&quot;sys_type&quot; = 'NETWJOIN'" scalemaxdenom="1500" label="Netwjoin" symbol="17"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="50,48,55,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="50,48,55,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="W"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="W" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="10" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,100,200,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="10" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,100,200,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="11" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,127,0,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="11" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,127,0,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="P"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="P" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="12" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="32,10,129,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="12" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="32,10,129,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="13" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="151,234,218,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="13" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="151,234,218,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="14" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,183,25,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="255,255,255,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="14" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,183,25,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="R"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="R" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="15" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="15" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="V"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="V" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="16" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="0,242,255,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="50,48,55,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="1.8"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="16" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="0,242,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="50,48,55,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="1.8" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="17" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="70,151,75,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="0,0,0,0"/>
-              <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="3.75"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="17" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="70,151,75,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.75" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="cross"/>
-              <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="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="5"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="cross" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="35,200,120,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="35,200,120,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="S"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="S" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="26,115,162,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="26,115,162,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="D"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="D" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="25,237,206,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="25,237,206,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="251,154,153,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="251,154,153,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="191,246,61,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="6" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="191,246,61,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="F"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="F" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="7" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="227,26,28,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="7" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="227,26,28,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="H"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="H" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="8" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="133,133,133,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="8" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="133,133,133,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="9" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="129,10,78,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="0,0,0,0"/>
-              <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="4.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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="9" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="129,10,78,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,0" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="4.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="E"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0.20000000000000001,-0.20000000000000001"/>
-              <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="255,255,255,255"/>
-              <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="size" v="3.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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="E" k="chr"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0.20000000000000001,-0.20000000000000001" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="3.2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8814,21 +8998,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8931,6 +9115,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="sector_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrosector_id">
           <editWidget type="Range">
             <config>
@@ -9001,6 +9192,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dma_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodma_id">
           <editWidget type="Range">
             <config>
@@ -9015,6 +9213,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="presszone_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="staticpressure">
           <editWidget type="TextEdit">
             <config>
@@ -9029,6 +9234,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="dqa_name">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="macrodqa_id">
           <editWidget type="Range">
             <config>
@@ -9309,6 +9521,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="adate">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="adescript">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="accessibility">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="dma_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="presszone_style">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias field="node_id" name="" index="0"/>
@@ -9325,348 +9572,384 @@ def my_form_open(dialog, layer, feature):
         <alias field="expl_id" name="" index="11"/>
         <alias field="macroexpl_id" name="" index="12"/>
         <alias field="sector_id" name="" index="13"/>
-        <alias field="macrosector_id" name="" index="14"/>
-        <alias field="arc_id" name="" index="15"/>
-        <alias field="parent_id" name="" index="16"/>
-        <alias field="state" name="" index="17"/>
-        <alias field="state_type" name="" index="18"/>
-        <alias field="annotation" name="" index="19"/>
-        <alias field="observ" name="" index="20"/>
-        <alias field="comment" name="" index="21"/>
-        <alias field="minsector_id" name="" index="22"/>
-        <alias field="dma_id" name="" index="23"/>
-        <alias field="macrodma_id" name="" index="24"/>
-        <alias field="presszone_id" name="" index="25"/>
-        <alias field="staticpressure" name="" index="26"/>
-        <alias field="dqa_id" name="" index="27"/>
-        <alias field="macrodqa_id" name="" index="28"/>
-        <alias field="soilcat_id" name="" index="29"/>
-        <alias field="function_type" name="" index="30"/>
-        <alias field="category_type" name="" index="31"/>
-        <alias field="fluid_type" name="" index="32"/>
-        <alias field="location_type" name="" index="33"/>
-        <alias field="workcat_id" name="" index="34"/>
-        <alias field="workcat_id_end" name="" index="35"/>
-        <alias field="builtdate" name="" index="36"/>
-        <alias field="enddate" name="" index="37"/>
-        <alias field="buildercat_id" name="" index="38"/>
-        <alias field="ownercat_id" name="" index="39"/>
-        <alias field="muni_id" name="" index="40"/>
-        <alias field="postcode" name="" index="41"/>
-        <alias field="district_id" name="" index="42"/>
-        <alias field="streetname" name="" index="43"/>
-        <alias field="postnumber" name="" index="44"/>
-        <alias field="postcomplement" name="" index="45"/>
-        <alias field="streetname2" name="" index="46"/>
-        <alias field="postnumber2" name="" index="47"/>
-        <alias field="postcomplement2" name="" index="48"/>
-        <alias field="descript" name="" index="49"/>
-        <alias field="svg" name="" index="50"/>
-        <alias field="rotation" name="" index="51"/>
-        <alias field="link" name="" index="52"/>
-        <alias field="verified" name="" index="53"/>
-        <alias field="undelete" name="" index="54"/>
-        <alias field="label" name="" index="55"/>
-        <alias field="label_x" name="" index="56"/>
-        <alias field="label_y" name="" index="57"/>
-        <alias field="label_rotation" name="" index="58"/>
-        <alias field="publish" name="" index="59"/>
-        <alias field="inventory" name="" index="60"/>
-        <alias field="hemisphere" name="" index="61"/>
-        <alias field="num_value" name="" index="62"/>
-        <alias field="nodetype_id" name="" index="63"/>
-        <alias field="tstamp" name="" index="64"/>
-        <alias field="insert_user" name="" index="65"/>
-        <alias field="lastupdate" name="" index="66"/>
-        <alias field="lastupdate_user" name="" index="67"/>
+        <alias field="sector_name" name="" index="14"/>
+        <alias field="macrosector_id" name="" index="15"/>
+        <alias field="arc_id" name="" index="16"/>
+        <alias field="parent_id" name="" index="17"/>
+        <alias field="state" name="" index="18"/>
+        <alias field="state_type" name="" index="19"/>
+        <alias field="annotation" name="" index="20"/>
+        <alias field="observ" name="" index="21"/>
+        <alias field="comment" name="" index="22"/>
+        <alias field="minsector_id" name="" index="23"/>
+        <alias field="dma_id" name="" index="24"/>
+        <alias field="dma_name" name="" index="25"/>
+        <alias field="macrodma_id" name="" index="26"/>
+        <alias field="presszone_id" name="" index="27"/>
+        <alias field="presszone_name" name="" index="28"/>
+        <alias field="staticpressure" name="" index="29"/>
+        <alias field="dqa_id" name="" index="30"/>
+        <alias field="dqa_name" name="" index="31"/>
+        <alias field="macrodqa_id" name="" index="32"/>
+        <alias field="soilcat_id" name="" index="33"/>
+        <alias field="function_type" name="" index="34"/>
+        <alias field="category_type" name="" index="35"/>
+        <alias field="fluid_type" name="" index="36"/>
+        <alias field="location_type" name="" index="37"/>
+        <alias field="workcat_id" name="" index="38"/>
+        <alias field="workcat_id_end" name="" index="39"/>
+        <alias field="builtdate" name="" index="40"/>
+        <alias field="enddate" name="" index="41"/>
+        <alias field="buildercat_id" name="" index="42"/>
+        <alias field="ownercat_id" name="" index="43"/>
+        <alias field="muni_id" name="" index="44"/>
+        <alias field="postcode" name="" index="45"/>
+        <alias field="district_id" name="" index="46"/>
+        <alias field="streetname" name="" index="47"/>
+        <alias field="postnumber" name="" index="48"/>
+        <alias field="postcomplement" name="" index="49"/>
+        <alias field="streetname2" name="" index="50"/>
+        <alias field="postnumber2" name="" index="51"/>
+        <alias field="postcomplement2" name="" index="52"/>
+        <alias field="descript" name="" index="53"/>
+        <alias field="svg" name="" index="54"/>
+        <alias field="rotation" name="" index="55"/>
+        <alias field="link" name="" index="56"/>
+        <alias field="verified" name="" index="57"/>
+        <alias field="undelete" name="" index="58"/>
+        <alias field="label" name="" index="59"/>
+        <alias field="label_x" name="" index="60"/>
+        <alias field="label_y" name="" index="61"/>
+        <alias field="label_rotation" name="" index="62"/>
+        <alias field="publish" name="" index="63"/>
+        <alias field="inventory" name="" index="64"/>
+        <alias field="hemisphere" name="" index="65"/>
+        <alias field="num_value" name="" index="66"/>
+        <alias field="nodetype_id" name="" index="67"/>
+        <alias field="tstamp" name="" index="68"/>
+        <alias field="insert_user" name="" index="69"/>
+        <alias field="lastupdate" name="" index="70"/>
+        <alias field="lastupdate_user" name="" index="71"/>
+        <alias field="adate" name="" index="72"/>
+        <alias field="adescript" name="" index="73"/>
+        <alias field="accessibility" name="" index="74"/>
+        <alias field="dma_style" name="" index="75"/>
+        <alias field="presszone_style" name="" index="76"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
-        <default field="depth" applyOnUpdate="0" expression=""/>
-        <default field="node_type" applyOnUpdate="0" expression=""/>
-        <default field="sys_type" applyOnUpdate="0" expression=""/>
-        <default field="nodecat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_matcat_id" applyOnUpdate="0" expression=""/>
-        <default field="cat_pnom" applyOnUpdate="0" expression=""/>
-        <default field="cat_dnom" applyOnUpdate="0" expression=""/>
-        <default field="epa_type" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
-        <default field="parent_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="state_type" applyOnUpdate="0" expression=""/>
-        <default field="annotation" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="staticpressure" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodqa_id" applyOnUpdate="0" expression=""/>
-        <default field="soilcat_id" applyOnUpdate="0" expression=""/>
-        <default field="function_type" applyOnUpdate="0" expression=""/>
-        <default field="category_type" applyOnUpdate="0" expression=""/>
-        <default field="fluid_type" applyOnUpdate="0" expression=""/>
-        <default field="location_type" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="buildercat_id" applyOnUpdate="0" expression=""/>
-        <default field="ownercat_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetname" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="streetname2" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="svg" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rotation" applyOnUpdate="0" expression=""/>
-        <default field="publish" applyOnUpdate="0" expression=""/>
-        <default field="inventory" applyOnUpdate="0" expression=""/>
-        <default field="hemisphere" applyOnUpdate="0" expression=""/>
-        <default field="num_value" applyOnUpdate="0" expression=""/>
-        <default field="nodetype_id" applyOnUpdate="0" expression=""/>
-        <default field="tstamp" applyOnUpdate="0" expression=""/>
-        <default field="insert_user" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate" applyOnUpdate="0" expression=""/>
-        <default field="lastupdate_user" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default applyOnUpdate="0" field="depth" expression=""/>
+        <default applyOnUpdate="0" field="node_type" expression=""/>
+        <default applyOnUpdate="0" field="sys_type" expression=""/>
+        <default applyOnUpdate="0" field="nodecat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_matcat_id" expression=""/>
+        <default applyOnUpdate="0" field="cat_pnom" expression=""/>
+        <default applyOnUpdate="0" field="cat_dnom" expression=""/>
+        <default applyOnUpdate="0" field="epa_type" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_name" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
+        <default applyOnUpdate="0" field="parent_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="state_type" expression=""/>
+        <default applyOnUpdate="0" field="annotation" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_name" expression=""/>
+        <default applyOnUpdate="0" field="staticpressure" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_name" expression=""/>
+        <default applyOnUpdate="0" field="macrodqa_id" expression=""/>
+        <default applyOnUpdate="0" field="soilcat_id" expression=""/>
+        <default applyOnUpdate="0" field="function_type" expression=""/>
+        <default applyOnUpdate="0" field="category_type" expression=""/>
+        <default applyOnUpdate="0" field="fluid_type" expression=""/>
+        <default applyOnUpdate="0" field="location_type" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="buildercat_id" expression=""/>
+        <default applyOnUpdate="0" field="ownercat_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetname" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="streetname2" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="svg" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rotation" expression=""/>
+        <default applyOnUpdate="0" field="publish" expression=""/>
+        <default applyOnUpdate="0" field="inventory" expression=""/>
+        <default applyOnUpdate="0" field="hemisphere" expression=""/>
+        <default applyOnUpdate="0" field="num_value" expression=""/>
+        <default applyOnUpdate="0" field="nodetype_id" expression=""/>
+        <default applyOnUpdate="0" field="tstamp" expression=""/>
+        <default applyOnUpdate="0" field="insert_user" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate" expression=""/>
+        <default applyOnUpdate="0" field="lastupdate_user" expression=""/>
+        <default applyOnUpdate="0" field="adate" expression=""/>
+        <default applyOnUpdate="0" field="adescript" expression=""/>
+        <default applyOnUpdate="0" field="accessibility" expression=""/>
+        <default applyOnUpdate="0" field="dma_style" expression=""/>
+        <default applyOnUpdate="0" field="presszone_style" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="node_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sys_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_matcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_pnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cat_dnom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="epa_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="parent_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="annotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="minsector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszone_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="staticpressure" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="soilcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="function_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="category_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fluid_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="location_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="buildercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ownercat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetname2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="svg" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="publish" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="inventory" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hemisphere" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="num_value" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="nodetype_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="insert_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lastupdate_user" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="node_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sys_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_matcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_pnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cat_dnom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="epa_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="parent_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="annotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="comment" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="minsector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="staticpressure" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="soilcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="function_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="category_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="fluid_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="location_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="buildercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ownercat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetname2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="svg" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_x" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_y" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="label_rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="publish" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="inventory" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="hemisphere" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="num_value" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="nodetype_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="insert_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lastupdate_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="adescript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="accessibility" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_style" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_style" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
-        <constraint field="depth" desc="" exp=""/>
-        <constraint field="node_type" desc="" exp=""/>
-        <constraint field="sys_type" desc="" exp=""/>
-        <constraint field="nodecat_id" desc="" exp=""/>
-        <constraint field="cat_matcat_id" desc="" exp=""/>
-        <constraint field="cat_pnom" desc="" exp=""/>
-        <constraint field="cat_dnom" desc="" exp=""/>
-        <constraint field="epa_type" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
-        <constraint field="parent_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="state_type" desc="" exp=""/>
-        <constraint field="annotation" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="staticpressure" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="macrodqa_id" desc="" exp=""/>
-        <constraint field="soilcat_id" desc="" exp=""/>
-        <constraint field="function_type" desc="" exp=""/>
-        <constraint field="category_type" desc="" exp=""/>
-        <constraint field="fluid_type" desc="" exp=""/>
-        <constraint field="location_type" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="buildercat_id" desc="" exp=""/>
-        <constraint field="ownercat_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetname" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="streetname2" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="svg" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rotation" desc="" exp=""/>
-        <constraint field="publish" desc="" exp=""/>
-        <constraint field="inventory" desc="" exp=""/>
-        <constraint field="hemisphere" desc="" exp=""/>
-        <constraint field="num_value" desc="" exp=""/>
-        <constraint field="nodetype_id" desc="" exp=""/>
-        <constraint field="tstamp" desc="" exp=""/>
-        <constraint field="insert_user" desc="" exp=""/>
-        <constraint field="lastupdate" desc="" exp=""/>
-        <constraint field="lastupdate_user" desc="" exp=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
+        <constraint exp="" field="depth" desc=""/>
+        <constraint exp="" field="node_type" desc=""/>
+        <constraint exp="" field="sys_type" desc=""/>
+        <constraint exp="" field="nodecat_id" desc=""/>
+        <constraint exp="" field="cat_matcat_id" desc=""/>
+        <constraint exp="" field="cat_pnom" desc=""/>
+        <constraint exp="" field="cat_dnom" desc=""/>
+        <constraint exp="" field="epa_type" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="sector_name" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
+        <constraint exp="" field="parent_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="state_type" desc=""/>
+        <constraint exp="" field="annotation" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dma_name" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="presszone_name" desc=""/>
+        <constraint exp="" field="staticpressure" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="dqa_name" desc=""/>
+        <constraint exp="" field="macrodqa_id" desc=""/>
+        <constraint exp="" field="soilcat_id" desc=""/>
+        <constraint exp="" field="function_type" desc=""/>
+        <constraint exp="" field="category_type" desc=""/>
+        <constraint exp="" field="fluid_type" desc=""/>
+        <constraint exp="" field="location_type" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="buildercat_id" desc=""/>
+        <constraint exp="" field="ownercat_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetname" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="streetname2" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="svg" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="link" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rotation" desc=""/>
+        <constraint exp="" field="publish" desc=""/>
+        <constraint exp="" field="inventory" desc=""/>
+        <constraint exp="" field="hemisphere" desc=""/>
+        <constraint exp="" field="num_value" desc=""/>
+        <constraint exp="" field="nodetype_id" desc=""/>
+        <constraint exp="" field="tstamp" desc=""/>
+        <constraint exp="" field="insert_user" desc=""/>
+        <constraint exp="" field="lastupdate" desc=""/>
+        <constraint exp="" field="lastupdate_user" desc=""/>
+        <constraint exp="" field="adate" desc=""/>
+        <constraint exp="" field="adescript" desc=""/>
+        <constraint exp="" field="accessibility" desc=""/>
+        <constraint exp="" field="dma_style" desc=""/>
+        <constraint exp="" field="presszone_style" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="elevation" hidden="0" width="-1" type="field"/>
-          <column name="depth" hidden="0" width="-1" type="field"/>
-          <column name="node_type" hidden="0" width="-1" type="field"/>
-          <column name="sys_type" hidden="0" width="-1" type="field"/>
-          <column name="nodecat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_matcat_id" hidden="0" width="-1" type="field"/>
-          <column name="cat_pnom" hidden="0" width="-1" type="field"/>
-          <column name="cat_dnom" hidden="0" width="-1" type="field"/>
-          <column name="epa_type" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column name="parent_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="state_type" hidden="0" width="-1" type="field"/>
-          <column name="annotation" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="comment" hidden="0" width="-1" type="field"/>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="staticpressure" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodqa_id" hidden="0" width="-1" type="field"/>
-          <column name="soilcat_id" hidden="0" width="-1" type="field"/>
-          <column name="function_type" hidden="0" width="-1" type="field"/>
-          <column name="category_type" hidden="0" width="-1" type="field"/>
-          <column name="fluid_type" hidden="0" width="-1" type="field"/>
-          <column name="location_type" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="buildercat_id" hidden="0" width="-1" type="field"/>
-          <column name="ownercat_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="district_id" hidden="0" width="-1" type="field"/>
-          <column name="streetname" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="streetname2" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
-          <column name="svg" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="link" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rotation" hidden="0" width="-1" type="field"/>
-          <column name="publish" hidden="0" width="-1" type="field"/>
-          <column name="inventory" hidden="0" width="-1" type="field"/>
-          <column name="hemisphere" hidden="0" width="-1" type="field"/>
-          <column name="num_value" hidden="0" width="-1" type="field"/>
-          <column name="nodetype_id" hidden="0" width="-1" type="field"/>
-          <column name="tstamp" hidden="0" width="-1" type="field"/>
-          <column name="insert_user" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate" hidden="0" width="-1" type="field"/>
-          <column name="lastupdate_user" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="elevation"/>
+          <column type="field" width="-1" hidden="0" name="depth"/>
+          <column type="field" width="-1" hidden="0" name="node_type"/>
+          <column type="field" width="-1" hidden="0" name="sys_type"/>
+          <column type="field" width="-1" hidden="0" name="nodecat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_matcat_id"/>
+          <column type="field" width="-1" hidden="0" name="cat_pnom"/>
+          <column type="field" width="-1" hidden="0" name="cat_dnom"/>
+          <column type="field" width="-1" hidden="0" name="epa_type"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="field" width="-1" hidden="0" name="parent_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="state_type"/>
+          <column type="field" width="-1" hidden="0" name="annotation"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="comment"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="staticpressure"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodqa_id"/>
+          <column type="field" width="-1" hidden="0" name="soilcat_id"/>
+          <column type="field" width="-1" hidden="0" name="function_type"/>
+          <column type="field" width="-1" hidden="0" name="category_type"/>
+          <column type="field" width="-1" hidden="0" name="fluid_type"/>
+          <column type="field" width="-1" hidden="0" name="location_type"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="buildercat_id"/>
+          <column type="field" width="-1" hidden="0" name="ownercat_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="streetname"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="streetname2"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="svg"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="field" width="-1" hidden="0" name="label"/>
+          <column type="field" width="-1" hidden="0" name="label_x"/>
+          <column type="field" width="-1" hidden="0" name="label_y"/>
+          <column type="field" width="-1" hidden="0" name="label_rotation"/>
+          <column type="field" width="-1" hidden="0" name="publish"/>
+          <column type="field" width="-1" hidden="0" name="inventory"/>
+          <column type="field" width="-1" hidden="0" name="hemisphere"/>
+          <column type="field" width="-1" hidden="0" name="num_value"/>
+          <column type="field" width="-1" hidden="0" name="nodetype_id"/>
+          <column type="field" width="-1" hidden="0" name="tstamp"/>
+          <column type="field" width="-1" hidden="0" name="insert_user"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate"/>
+          <column type="field" width="-1" hidden="0" name="lastupdate_user"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9698,74 +9981,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="annotation"/>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="buildercat_id"/>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cat_dnom"/>
-        <field editable="1" name="cat_matcat_id"/>
-        <field editable="1" name="cat_pnom"/>
-        <field editable="1" name="category_type"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="depth"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="district_id"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="dqa_id"/>
-        <field editable="1" name="elevation"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="epa_type"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="fluid_type"/>
-        <field editable="1" name="function_type"/>
-        <field editable="1" name="hemisphere"/>
-        <field editable="1" name="insert_user"/>
-        <field editable="1" name="inventory"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="label_rotation"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="lastupdate"/>
-        <field editable="1" name="lastupdate_user"/>
-        <field editable="1" name="link"/>
-        <field editable="1" name="location_type"/>
-        <field editable="1" name="macrodma_id"/>
-        <field editable="1" name="macrodqa_id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macrosector_id"/>
-        <field editable="1" name="minsector_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="node_type"/>
-        <field editable="1" name="nodecat_id"/>
-        <field editable="1" name="nodetype_id"/>
-        <field editable="1" name="num_value"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="ownercat_id"/>
-        <field editable="1" name="parent_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="publish"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="soilcat_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="state_type"/>
-        <field editable="1" name="staticpressure"/>
-        <field editable="1" name="streetname"/>
-        <field editable="1" name="streetname2"/>
-        <field editable="1" name="svg"/>
-        <field editable="1" name="sys_type"/>
-        <field editable="1" name="tstamp"/>
-        <field editable="1" name="undelete"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="annotation" editable="1"/>
+        <field name="arc_id" editable="1"/>
+        <field name="buildercat_id" editable="1"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cat_dnom" editable="1"/>
+        <field name="cat_matcat_id" editable="1"/>
+        <field name="cat_pnom" editable="1"/>
+        <field name="category_type" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="comment" editable="1"/>
+        <field name="depth" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="dqa_id" editable="1"/>
+        <field name="elevation" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="epa_type" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="fluid_type" editable="1"/>
+        <field name="function_type" editable="1"/>
+        <field name="hemisphere" editable="1"/>
+        <field name="insert_user" editable="1"/>
+        <field name="inventory" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="label_rotation" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="lastupdate" editable="1"/>
+        <field name="lastupdate_user" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="location_type" editable="1"/>
+        <field name="macrodma_id" editable="1"/>
+        <field name="macrodqa_id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macrosector_id" editable="1"/>
+        <field name="minsector_id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="node_type" editable="1"/>
+        <field name="nodecat_id" editable="1"/>
+        <field name="nodetype_id" editable="1"/>
+        <field name="num_value" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="ownercat_id" editable="1"/>
+        <field name="parent_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="publish" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="soilcat_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="state_type" editable="1"/>
+        <field name="staticpressure" editable="1"/>
+        <field name="streetname" editable="1"/>
+        <field name="streetname2" editable="1"/>
+        <field name="svg" editable="1"/>
+        <field name="sys_type" editable="1"/>
+        <field name="tstamp" editable="1"/>
+        <field name="undelete" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="annotation"/>
@@ -9841,7 +10124,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>streetname</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="0" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="0" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -9874,6 +10157,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -9890,7 +10182,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">postgres</provider>
       <vectorjoins/>
@@ -9907,33 +10207,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="22,186,107,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="0,0,0,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="22,186,107,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9942,11 +10242,29 @@ def my_form_open(dialog, layer, feature):
         <rotation/>
         <sizescale/>
       </renderer-v2>
-      <customproperties/>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9955,19 +10273,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="visitcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Test" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9976,8 +10293,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9986,8 +10303,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -9996,8 +10313,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10006,8 +10323,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10016,21 +10333,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10049,48 +10363,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="visitcat_id" applyOnUpdate="0" expression=""/>
-        <default field="ext_code" applyOnUpdate="0" expression=""/>
-        <default field="startdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="user_name" applyOnUpdate="0" expression=""/>
-        <default field="webclient_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="visitcat_id" expression=""/>
+        <default applyOnUpdate="0" field="ext_code" expression=""/>
+        <default applyOnUpdate="0" field="startdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="user_name" expression=""/>
+        <default applyOnUpdate="0" field="webclient_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="visitcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="ext_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="startdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="user_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="webclient_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="visitcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="ext_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="startdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="user_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="webclient_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="visitcat_id" desc="" exp=""/>
-        <constraint field="ext_code" desc="" exp=""/>
-        <constraint field="startdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="user_name" desc="" exp=""/>
-        <constraint field="webclient_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="visitcat_id" desc=""/>
+        <constraint exp="" field="ext_code" desc=""/>
+        <constraint exp="" field="startdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="user_name" desc=""/>
+        <constraint exp="" field="webclient_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="startdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="user_name" hidden="0" width="-1" type="field"/>
-          <column name="webclient_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="startdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="user_name"/>
+          <column type="field" width="-1" hidden="0" name="webclient_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="visitcat_id"/>
+          <column type="field" width="-1" hidden="0" name="ext_code"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10102,25 +10418,50 @@ def my_form_open(dialog, layer, feature):
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode><![CDATA[# -*- codificación: utf-8 -*-
+"""
+Los formularios de QGIS pueden tener una función de Python que
+es llamada cuando se abre el formulario.
+
+Use esta función para añadir lógica extra a sus formularios.
+
+Introduzca el nombre de la función en el campo
+"Python Init function".
+Sigue un ejemplo:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="ext_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="startdate"/>
-        <field editable="1" name="user_name"/>
-        <field editable="1" name="visitcat_id"/>
-        <field editable="1" name="webclient_id"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="ext_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="startdate" editable="1"/>
+        <field name="user_name" editable="1"/>
+        <field name="visitcat_id" editable="1"/>
+        <field name="webclient_id" editable="1"/>
       </editable>
-      <labelOnTop/>
+      <labelOnTop>
+        <field labelOnTop="0" name="enddate"/>
+        <field labelOnTop="0" name="expl_id"/>
+        <field labelOnTop="0" name="ext_code"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="startdate"/>
+        <field labelOnTop="0" name="user_name"/>
+        <field labelOnTop="0" name="visitcat_id"/>
+        <field labelOnTop="0" name="webclient_id"/>
+      </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "user_name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -10128,7 +10469,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>__YMAX__</ymax>
       </extent>
       <id>v_edit_presszone_d6c14d1a_a691_4ec8_a373_97438e05f219</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='presszone_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_presszone" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -10179,7 +10520,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -10203,168 +10544,168 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="name" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="name" symbollevels="0">
         <categories>
-          <category render="true" label="pzone1-1d" value="pzone1-1d" symbol="0"/>
-          <category render="true" label="pzone1-1s" value="pzone1-1s" symbol="1"/>
-          <category render="true" label="pzone1-2d" value="pzone1-2d" symbol="2"/>
-          <category render="true" label="pzone1-2s" value="pzone1-2s" symbol="3"/>
-          <category render="true" label="pzone2-1s" value="pzone2-1s" symbol="4"/>
-          <category render="true" label="pzone2-2d" value="pzone2-2d" symbol="5"/>
+          <category render="true" value="pzone1-1d" label="pzone1-1d" symbol="0"/>
+          <category render="true" value="pzone1-1s" label="pzone1-1s" symbol="1"/>
+          <category render="true" value="pzone1-2d" label="pzone1-2d" symbol="2"/>
+          <category render="true" value="pzone1-2s" label="pzone1-2s" symbol="3"/>
+          <category render="true" value="pzone2-1s" label="pzone2-1s" symbol="4"/>
+          <category render="true" value="pzone2-2d" label="pzone2-2d" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="30,71,221,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="30,71,221,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,158,123,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,158,123,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="53,225,211,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="53,225,211,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="191,218,90,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="191,218,90,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="119,222,126,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.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="119,222,126,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="0.4" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="180,99,227,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,4,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.4" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="180,99,227,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,4,0,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10382,27 +10723,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -10461,42 +10802,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="presszone_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="head" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="head" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="presszone_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="head" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="presszone_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="head" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="presszone_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="head" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="head" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="presszone_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
-          <column name="head" hidden="0" width="-1" type="field"/>
-          <column name="stylesheet" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
+          <column type="field" width="-1" hidden="0" name="head"/>
+          <column type="field" width="-1" hidden="0" name="stylesheet"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10528,12 +10869,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="1" name="head"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="presszone_id"/>
-        <field editable="1" name="stylesheet"/>
+        <field name="expl_id" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="head" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="stylesheet" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -10547,7 +10888,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="5000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="1" maxScale="1" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="1" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="5000" geometry="Point" refreshOnNotifyMessage="">
       <id>v_edit_samplepoint20170619120830016</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_samplepoint" (the_geom) sql=</datasource>
       <keywordList>
@@ -10600,7 +10941,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -10624,59 +10965,59 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="166,206,227,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="square"/>
-              <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="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="area"/>
-              <prop k="size" v="3"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="166,206,227,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="square" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="area" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="FontMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="chr" v="M"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="font" v="Dingbats"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,-0.40000000000000002"/>
-              <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="255,255,255,255"/>
-              <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="size" v="2.25"/>
-              <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"/>
+            <layer enabled="1" locked="0" pass="0" class="FontMarker">
+              <prop v="0" k="angle"/>
+              <prop v="M" k="chr"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="Dingbats" k="font"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,-0.40000000000000002" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="255,255,255,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="2.25" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10693,28 +11034,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <LinearlyInterpolatedDiagramRenderer upperValue="0" classificationAttributeExpression="" attributeLegend="1" lowerValue="0" upperHeight="50" diagramType="Histogram" lowerWidth="0" upperWidth="50" lowerHeight="0">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+      <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </LinearlyInterpolatedDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="sample_id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="sample_id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10723,8 +11064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10733,8 +11074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10743,8 +11084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10753,122 +11094,58 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="featurecat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="ADAPTATION" type="QString" value="ADAPTATION"/>
-                  <Option name="AIR_VALVE" type="QString" value="AIR_VALVE"/>
-                  <Option name="BYPASS_REGISTER" type="QString" value="BYPASS_REGISTER"/>
-                  <Option name="CHECK_VALVE" type="QString" value="CHECK_VALVE"/>
-                  <Option name="CLORINATHOR" type="QString" value="CLORINATHOR"/>
-                  <Option name="CONTROL_REGISTER" type="QString" value="CONTROL_REGISTER"/>
-                  <Option name="CURVE" type="QString" value="CURVE"/>
-                  <Option name="ENDLINE" type="QString" value="ENDLINE"/>
-                  <Option name="EXPANTANK" type="QString" value="EXPANTANK"/>
-                  <Option name="FILTER" type="QString" value="FILTER"/>
-                  <Option name="FLEXUNION" type="QString" value="FLEXUNION"/>
-                  <Option name="FLOWMETER" type="QString" value="FLOWMETER"/>
-                  <Option name="FL_CONTR_VALVE" type="QString" value="FL_CONTR_VALVE"/>
-                  <Option name="FOUNTAIN" type="QString" value="FOUNTAIN"/>
-                  <Option name="GEN_PURP_VALVE" type="QString" value="GEN_PURP_VALVE"/>
-                  <Option name="GREENTAP" type="QString" value="GREENTAP"/>
-                  <Option name="GREEN_VALVE" type="QString" value="GREEN_VALVE"/>
-                  <Option name="HYDRANT" type="QString" value="HYDRANT"/>
-                  <Option name="JUNCTION" type="QString" value="JUNCTION"/>
-                  <Option name="MANHOLE" type="QString" value="MANHOLE"/>
-                  <Option name="NETELEMENT" type="QString" value="NETELEMENT"/>
-                  <Option name="NETSAMPLEPOINT" type="QString" value="NETSAMPLEPOINT"/>
-                  <Option name="OUTFALL_VALVE" type="QString" value="OUTFALL_VALVE"/>
-                  <Option name="PIPE" type="QString" value="PIPE"/>
-                  <Option name="PRESSURE_METER" type="QString" value="PRESSURE_METER"/>
-                  <Option name="PR_BREAK_VALVE" type="QString" value="PR_BREAK_VALVE"/>
-                  <Option name="PR_REDUC_VALVE" type="QString" value="PR_REDUC_VALVE"/>
-                  <Option name="PR_SUSTA_VALVE" type="QString" value="PR_SUSTA_VALVE"/>
-                  <Option name="PUMP" type="QString" value="PUMP"/>
-                  <Option name="REDUCTION" type="QString" value="REDUCTION"/>
-                  <Option name="REGISTER" type="QString" value="REGISTER"/>
-                  <Option name="SHUTOFF_VALVE" type="QString" value="SHUTOFF_VALVE"/>
-                  <Option name="SOURCE" type="QString" value="SOURCE"/>
-                  <Option name="T" type="QString" value="T"/>
-                  <Option name="TANK" type="QString" value="TANK"/>
-                  <Option name="TAP" type="QString" value="TAP"/>
-                  <Option name="THROTTLE_VALVE" type="QString" value="THROTTLE_VALVE"/>
-                  <Option name="VALVE_REGISTER" type="QString" value="VALVE_REGISTER"/>
-                  <Option name="VARC" type="QString" value="VARC"/>
-                  <Option name="VCONNEC" type="QString" value="VCONNEC"/>
-                  <Option name="WATERWELL" type="QString" value="WATERWELL"/>
-                  <Option name="WATER_CONNECTION" type="QString" value="WATER_CONNECTION"/>
-                  <Option name="WJOIN" type="QString" value="WJOIN"/>
-                  <Option name="WTP" type="QString" value="WTP"/>
-                  <Option name="X" type="QString" value="X"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="dma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="dma1-1d" type="QString" value="1"/>
-                  <Option name="dma1-2d" type="QString" value="2"/>
-                  <Option name="dma2-1d" type="QString" value="3"/>
-                  <Option name="source-1" type="QString" value="4"/>
-                  <Option name="source-2" type="QString" value="5"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="macrodma_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="macrodma_01" type="QString" value="1"/>
-                  <Option name="macrodma_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="presszonecat_id">
-          <editWidget type="ValueMap">
+        <field name="presszone_id">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="pzone1-1d" type="QString" value="3"/>
-                  <Option name="pzone1-1s" type="QString" value="1"/>
-                  <Option name="pzone1-2d" type="QString" value="4"/>
-                  <Option name="pzone1-2s" type="QString" value="2"/>
-                  <Option name="pzone2-1s" type="QString" value="5"/>
-                  <Option name="pzone2-2d" type="QString" value="6"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="state">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="OBSOLETE" type="QString" value="0"/>
-                  <Option name="ON_SERVICE" type="QString" value="1"/>
-                  <Option name="PLANIFIED" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10877,10 +11154,11 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10889,32 +11167,32 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option name="allow_null" type="QString" value="1"/>
-                <Option name="calendar_popup" type="QString" value="1"/>
-                <Option name="display_format" type="QString" value="yyyy-MM-dd"/>
-                <Option name="field_format" type="QString" value="yyyy-MM-dd"/>
+                <Option type="bool" name="allow_null" value="true"/>
+                <Option type="bool" name="calendar_popup" value="true"/>
+                <Option type="QString" name="display_format" value="yyyy-MM-dd"/>
+                <Option type="QString" name="field_format" value="yyyy-MM-dd"/>
+                <Option type="bool" name="field_iso_format" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="work1" type="QString" value="work1"/>
-                  <Option name="work2" type="QString" value="work2"/>
-                  <Option name="work3" type="QString" value="work3"/>
-                  <Option name="work4" type="QString" value="work4"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="workcat_id_end">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -10922,54 +11200,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -10978,14 +11230,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option name="AllowMulti" type="QString" value="0"/>
-                <Option name="AllowNull" type="QString" value="0"/>
-                <Option name="FilterExpression" type="QString" value=""/>
-                <Option name="Key" type="QString" value="postnumber"/>
-                <Option name="Layer" type="QString" value="ext_address20171204171433160"/>
-                <Option name="OrderByValue" type="QString" value="0"/>
-                <Option name="UseCompleter" type="QString" value="0"/>
-                <Option name="Value" type="QString" value="postnumber"/>
+                <Option type="bool" name="AllowMulti" value="false"/>
+                <Option type="bool" name="AllowNull" value="false"/>
+                <Option type="QString" name="FilterExpression" value=""/>
+                <Option type="QString" name="Key" value=""/>
+                <Option type="QString" name="Layer" value=""/>
+                <Option type="QString" name="LayerName" value=""/>
+                <Option type="QString" name="LayerProviderName" value=""/>
+                <Option type="QString" name="LayerSource" value=""/>
+                <Option type="int" name="NofColumns" value="1"/>
+                <Option type="bool" name="OrderByValue" value="false"/>
+                <Option type="bool" name="UseCompleter" value="false"/>
+                <Option type="QString" name="Value" value=""/>
               </Option>
             </config>
           </editWidget>
@@ -10994,50 +11250,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="district_id">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis2_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11046,8 +11280,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11056,8 +11290,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11066,8 +11300,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11076,8 +11310,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11086,8 +11320,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11096,41 +11330,39 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="verified">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="TO REVIEW" type="QString" value="TO REVIEW"/>
-                  <Option name="VERIFIED" type="QString" value="VERIFIED"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="link">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -11143,7 +11375,7 @@ def my_form_open(dialog, layer, feature):
         <alias field="featurecat_id" name="featurecat_id" index="4"/>
         <alias field="dma_id" name="dma_id" index="5"/>
         <alias field="macrodma_id" name="macrodma_id" index="6"/>
-        <alias field="presszonecat_id" name="presszonecat_id" index="7"/>
+        <alias field="presszone_id" name="" index="7"/>
         <alias field="state" name="state" index="8"/>
         <alias field="builtdate" name="builtdate" index="9"/>
         <alias field="enddate" name="enddate" index="10"/>
@@ -11169,132 +11401,134 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sample_id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="lab_code" applyOnUpdate="0" expression=""/>
-        <default field="feature_id" applyOnUpdate="0" expression=""/>
-        <default field="featurecat_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="macrodma_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="builtdate" applyOnUpdate="0" expression=""/>
-        <default field="enddate" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id" applyOnUpdate="0" expression=""/>
-        <default field="workcat_id_end" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="district_id" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis2_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber2" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement" applyOnUpdate="0" expression=""/>
-        <default field="postcomplement2" applyOnUpdate="0" expression=""/>
-        <default field="place_name" applyOnUpdate="0" expression=""/>
-        <default field="cabinet" applyOnUpdate="0" expression=""/>
-        <default field="observations" applyOnUpdate="0" expression=""/>
-        <default field="verified" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="link" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sample_id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="lab_code" expression=""/>
+        <default applyOnUpdate="0" field="feature_id" expression=""/>
+        <default applyOnUpdate="0" field="featurecat_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="macrodma_id" expression=""/>
+        <default applyOnUpdate="0" field="presszone_id" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="builtdate" expression=""/>
+        <default applyOnUpdate="0" field="enddate" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id" expression=""/>
+        <default applyOnUpdate="0" field="workcat_id_end" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="district_id" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis2_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber2" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement" expression=""/>
+        <default applyOnUpdate="0" field="postcomplement2" expression=""/>
+        <default applyOnUpdate="0" field="place_name" expression=""/>
+        <default applyOnUpdate="0" field="cabinet" expression=""/>
+        <default applyOnUpdate="0" field="observations" expression=""/>
+        <default applyOnUpdate="0" field="verified" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="link" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sample_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="lab_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="featurecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrodma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="builtdate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="enddate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="workcat_id_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="district_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis2_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcomplement2" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="place_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cabinet" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observations" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="verified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="link" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sample_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="lab_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="featurecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrodma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszone_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="builtdate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="enddate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="workcat_id_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="district_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis2_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcomplement2" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="place_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="cabinet" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observations" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="verified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="link" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sample_id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="lab_code" desc="" exp=""/>
-        <constraint field="feature_id" desc="" exp=""/>
-        <constraint field="featurecat_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="macrodma_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="builtdate" desc="" exp=""/>
-        <constraint field="enddate" desc="" exp=""/>
-        <constraint field="workcat_id" desc="" exp=""/>
-        <constraint field="workcat_id_end" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="district_id" desc="" exp=""/>
-        <constraint field="streetaxis2_id" desc="" exp=""/>
-        <constraint field="postnumber2" desc="" exp=""/>
-        <constraint field="postcomplement" desc="" exp=""/>
-        <constraint field="postcomplement2" desc="" exp=""/>
-        <constraint field="place_name" desc="" exp=""/>
-        <constraint field="cabinet" desc="" exp=""/>
-        <constraint field="observations" desc="" exp=""/>
-        <constraint field="verified" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="link" desc="" exp=""/>
+        <constraint exp="" field="sample_id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="lab_code" desc=""/>
+        <constraint exp="" field="feature_id" desc=""/>
+        <constraint exp="" field="featurecat_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="macrodma_id" desc=""/>
+        <constraint exp="" field="presszone_id" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="builtdate" desc=""/>
+        <constraint exp="" field="enddate" desc=""/>
+        <constraint exp="" field="workcat_id" desc=""/>
+        <constraint exp="" field="workcat_id_end" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="district_id" desc=""/>
+        <constraint exp="" field="streetaxis2_id" desc=""/>
+        <constraint exp="" field="postnumber2" desc=""/>
+        <constraint exp="" field="postcomplement" desc=""/>
+        <constraint exp="" field="postcomplement2" desc=""/>
+        <constraint exp="" field="place_name" desc=""/>
+        <constraint exp="" field="cabinet" desc=""/>
+        <constraint exp="" field="observations" desc=""/>
+        <constraint exp="" field="verified" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="link" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sample_id" hidden="0" width="-1" type="field"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="lab_code" hidden="0" width="-1" type="field"/>
-          <column name="feature_id" hidden="0" width="-1" type="field"/>
-          <column name="featurecat_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="macrodma_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="builtdate" hidden="0" width="-1" type="field"/>
-          <column name="enddate" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id" hidden="0" width="-1" type="field"/>
-          <column name="workcat_id_end" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis2_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber2" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement" hidden="0" width="-1" type="field"/>
-          <column name="postcomplement2" hidden="0" width="-1" type="field"/>
-          <column name="place_name" hidden="0" width="-1" type="field"/>
-          <column name="cabinet" hidden="0" width="-1" type="field"/>
-          <column name="observations" hidden="0" width="-1" type="field"/>
-          <column name="verified" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="sample_id"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="lab_code"/>
+          <column type="field" width="-1" hidden="0" name="feature_id"/>
+          <column type="field" width="-1" hidden="0" name="featurecat_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="macrodma_id"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="builtdate"/>
+          <column type="field" width="-1" hidden="0" name="enddate"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id"/>
+          <column type="field" width="-1" hidden="0" name="workcat_id_end"/>
+          <column type="field" width="-1" hidden="0" name="rotation"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis2_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber2"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement"/>
+          <column type="field" width="-1" hidden="0" name="postcomplement2"/>
+          <column type="field" width="-1" hidden="0" name="place_name"/>
+          <column type="field" width="-1" hidden="0" name="cabinet"/>
+          <column type="field" width="-1" hidden="0" name="observations"/>
+          <column type="field" width="-1" hidden="0" name="verified"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="presszone_id"/>
+          <column type="field" width="-1" hidden="0" name="district_id"/>
+          <column type="field" width="-1" hidden="0" name="link"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11326,45 +11560,49 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="builtdate"/>
-        <field editable="1" name="cabinet"/>
-        <field editable="1" name="code"/>
-        <field editable="1" name="dma_id"/>
-        <field editable="1" name="enddate"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="feature_id"/>
-        <field editable="1" name="featurecat_id"/>
-        <field editable="1" name="lab_code"/>
-        <field editable="1" name="link"/>
-        <field editable="0" name="macrodma_id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observations"/>
-        <field editable="1" name="place_name"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postcomplement"/>
-        <field editable="1" name="postcomplement2"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="postnumber2"/>
-        <field editable="1" name="presszonecat_id"/>
-        <field editable="1" name="rotation"/>
-        <field editable="1" name="sample_id"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="streetaxis2_id"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="verified"/>
-        <field editable="1" name="workcat_id"/>
-        <field editable="1" name="workcat_id_end"/>
+        <field name="builtdate" editable="1"/>
+        <field name="cabinet" editable="1"/>
+        <field name="code" editable="1"/>
+        <field name="district_id" editable="1"/>
+        <field name="dma_id" editable="1"/>
+        <field name="enddate" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="feature_id" editable="1"/>
+        <field name="featurecat_id" editable="1"/>
+        <field name="lab_code" editable="1"/>
+        <field name="link" editable="1"/>
+        <field name="macrodma_id" editable="0"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observations" editable="1"/>
+        <field name="place_name" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postcomplement" editable="1"/>
+        <field name="postcomplement2" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="postnumber2" editable="1"/>
+        <field name="presszone_id" editable="1"/>
+        <field name="presszonecat_id" editable="1"/>
+        <field name="rotation" editable="1"/>
+        <field name="sample_id" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="streetaxis2_id" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="verified" editable="1"/>
+        <field name="workcat_id" editable="1"/>
+        <field name="workcat_id_end" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="builtdate"/>
         <field labelOnTop="0" name="cabinet"/>
         <field labelOnTop="0" name="code"/>
+        <field labelOnTop="0" name="district_id"/>
         <field labelOnTop="0" name="dma_id"/>
         <field labelOnTop="0" name="enddate"/>
         <field labelOnTop="0" name="expl_id"/>
         <field labelOnTop="0" name="feature_id"/>
         <field labelOnTop="0" name="featurecat_id"/>
         <field labelOnTop="0" name="lab_code"/>
+        <field labelOnTop="0" name="link"/>
         <field labelOnTop="0" name="macrodma_id"/>
         <field labelOnTop="0" name="muni_id"/>
         <field labelOnTop="0" name="observations"/>
@@ -11374,6 +11612,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="postcomplement2"/>
         <field labelOnTop="0" name="postnumber"/>
         <field labelOnTop="0" name="postnumber2"/>
+        <field labelOnTop="0" name="presszone_id"/>
         <field labelOnTop="0" name="presszonecat_id"/>
         <field labelOnTop="0" name="rotation"/>
         <field labelOnTop="0" name="sample_id"/>
@@ -11388,7 +11627,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_edit_sector20171204170540567</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sector_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_sector" (the_geom) sql=</datasource>
       <keywordList>
@@ -11441,7 +11686,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11465,144 +11710,144 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="sector_id" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="sector_id" symbollevels="0">
         <categories>
-          <category render="true" label="0" value="0" symbol="0"/>
-          <category render="true" label="1" value="1" symbol="1"/>
-          <category render="true" label="2" value="2" symbol="2"/>
-          <category render="true" label="3" value="3" symbol="3"/>
-          <category render="true" label="4" value="4" symbol="4"/>
-          <category render="true" label="5" value="5" symbol="5"/>
+          <category render="true" value="0" label="0" symbol="0"/>
+          <category render="true" value="1" label="1" symbol="1"/>
+          <category render="true" value="2" label="2" symbol="2"/>
+          <category render="true" value="3" label="3" symbol="3"/>
+          <category render="true" value="4" label="4" symbol="4"/>
+          <category render="true" value="5" label="5" symbol="5"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="197,39,252,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="197,39,252,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="182,13,85,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="182,13,85,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="49,173,206,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="2" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="49,173,206,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="56,35,7,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="3" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="56,35,7,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="33,35,112,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="4" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="33,35,112,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="0.5" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="190,197,137,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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="0.5" force_rhr="0" name="5" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="190,197,137,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11621,21 +11866,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11644,8 +11889,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11654,8 +11899,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11664,8 +11909,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11674,8 +11919,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11684,8 +11929,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11694,8 +11939,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -11720,45 +11965,45 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
-        <default field="macrosector_id" applyOnUpdate="0" expression=""/>
-        <default field="undelete" applyOnUpdate="0" expression=""/>
-        <default field="grafconfig" applyOnUpdate="0" expression=""/>
-        <default field="stylesheet" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
+        <default applyOnUpdate="0" field="macrosector_id" expression=""/>
+        <default applyOnUpdate="0" field="undelete" expression=""/>
+        <default applyOnUpdate="0" field="grafconfig" expression=""/>
+        <default applyOnUpdate="0" field="stylesheet" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="sector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macrosector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="undelete" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="grafconfig" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="stylesheet" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="sector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macrosector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="undelete" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="grafconfig" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="stylesheet" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
-        <constraint field="macrosector_id" desc="" exp=""/>
-        <constraint field="undelete" desc="" exp=""/>
-        <constraint field="grafconfig" desc="" exp=""/>
-        <constraint field="stylesheet" desc="" exp=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
+        <constraint exp="" field="macrosector_id" desc=""/>
+        <constraint exp="" field="undelete" desc=""/>
+        <constraint exp="" field="grafconfig" desc=""/>
+        <constraint exp="" field="stylesheet" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="172" type="field"/>
-          <column name="descript" hidden="0" width="184" type="field"/>
-          <column name="undelete" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="macrosector_id" hidden="0" width="-1" type="field"/>
-          <column name="grafconfig" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="172" hidden="0" name="name"/>
+          <column type="field" width="184" hidden="0" name="descript"/>
+          <column type="field" width="-1" hidden="0" name="undelete"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="macrosector_id"/>
+          <column type="field" width="-1" hidden="0" name="grafconfig"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11790,12 +12035,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="grafconfig"/>
-        <field editable="0" name="macrosector_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="sector_id"/>
-        <field editable="1" name="undelete"/>
+        <field name="descript" editable="1"/>
+        <field name="grafconfig" editable="1"/>
+        <field name="macrosector_id" editable="0"/>
+        <field name="name" editable="1"/>
+        <field name="sector_id" editable="1"/>
+        <field name="undelete" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="descript"/>
@@ -11809,7 +12054,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "descript", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="0" minScale="1500" geometry="Point" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -11868,7 +12113,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11892,33 +12137,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="229,241,175,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="0,0,0,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="5"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="229,241,175,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11929,79 +12174,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="MS Shell Dlg 2" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="postnumber">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="196,60,57,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="MS Shell Dlg 2" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="postnumber" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="196,60,57,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="3" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="1" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="10" maxCurvedCharAngleIn="25" layerType="PointGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="1" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="PointGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="10" centroidInside="0" placement="1" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -12015,21 +12260,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.61</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12038,19 +12283,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12059,43 +12303,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12104,8 +12323,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12114,21 +12333,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12136,7 +12352,10 @@ def my_form_open(dialog, layer, feature):
         <field name="name">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option type="Map">
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
+              </Option>
             </config>
           </editWidget>
         </field>
@@ -12154,50 +12373,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="plot_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="plot_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="plot_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="plot_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="plot_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="plot_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="name"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12229,14 +12448,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="plot_id"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="streetaxis_id"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="plot_id" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="expl_id"/>
@@ -12252,7 +12471,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12311,7 +12530,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -12335,26 +12554,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="223,223,200,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="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="223,223,200,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12372,33 +12591,33 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -12407,8 +12626,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12417,19 +12636,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12438,43 +12656,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="streetaxis_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Avenida Can Carreras" type="QString" value="1-10450C"/>
-                  <Option name="Avenida de Aragó" type="QString" value="1-9100C"/>
-                  <Option name="Avenida de la Torre de la Vila" type="QString" value="1-9150C"/>
-                  <Option name="Avenida del General Prim" type="QString" value="1-11000C"/>
-                  <Option name="Calle Benviure" type="QString" value="1-10400C"/>
-                  <Option name="Calle Legalitat" type="QString" value="1-10100C"/>
-                  <Option name="Calle Victoria" type="QString" value="1-10330C"/>
-                  <Option name="Calle d'Antoni Gaudí" type="QString" value="1-10350C"/>
-                  <Option name="Calle d'Antoni Rubió i LLuch" type="QString" value="1-10410C"/>
-                  <Option name="Calle d'Eusebi Güell" type="QString" value="1-10310C"/>
-                  <Option name="Calle de Federico Garcia Lorca" type="QString" value="1-10110C"/>
-                  <Option name="Calle de Francesc Layret" type="QString" value="1-10230C"/>
-                  <Option name="Calle de Galicia" type="QString" value="1-10120C"/>
-                  <Option name="Calle de Johan Pfaff" type="QString" value="1-10320C"/>
-                  <Option name="Calle de Jordi Rubió i Balaguer" type="QString" value="1-10300C"/>
-                  <Option name="Calle de Josep Trueta" type="QString" value="1-9110C"/>
-                  <Option name="Calle de Lepant" type="QString" value="1-10480C"/>
-                  <Option name="Calle de Menorca" type="QString" value="1-10222C"/>
-                  <Option name="Calle de Narcis Monturiol" type="QString" value="1-9120C"/>
-                  <Option name="Calle de Roselló" type="QString" value="1-10360C"/>
-                  <Option name="Calle de Salvador Espriu" type="QString" value="1-10220C"/>
-                  <Option name="Calle de Salvador Seguí" type="QString" value="1-11011C"/>
-                  <Option name="Calle de la Mare de Deu de Montserrat" type="QString" value="1-10240C"/>
-                  <Option name="Passaje Santa Teresa" type="QString" value="1-10420C"/>
-                  <Option name="Ronda de Sant Ramon" type="QString" value="1-10000C"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12483,8 +12676,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12493,8 +12686,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12503,8 +12696,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12513,8 +12706,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12523,8 +12716,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12533,21 +12726,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12570,66 +12760,66 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="plot_code" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="complement" applyOnUpdate="0" expression=""/>
-        <default field="placement" applyOnUpdate="0" expression=""/>
-        <default field="square" applyOnUpdate="0" expression=""/>
-        <default field="observ" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="plot_code" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="complement" expression=""/>
+        <default applyOnUpdate="0" field="placement" expression=""/>
+        <default applyOnUpdate="0" field="square" expression=""/>
+        <default applyOnUpdate="0" field="observ" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="plot_code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="complement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="placement" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="square" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="observ" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="plot_code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="complement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="placement" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="square" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="observ" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="plot_code" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="complement" desc="" exp=""/>
-        <constraint field="placement" desc="" exp=""/>
-        <constraint field="square" desc="" exp=""/>
-        <constraint field="observ" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="plot_code" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="complement" desc=""/>
+        <constraint exp="" field="placement" desc=""/>
+        <constraint exp="" field="square" desc=""/>
+        <constraint exp="" field="observ" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="plot_code" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="complement" hidden="0" width="-1" type="field"/>
-          <column name="placement" hidden="0" width="-1" type="field"/>
-          <column name="square" hidden="0" width="-1" type="field"/>
-          <column name="observ" hidden="0" width="-1" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="plot_code"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="complement"/>
+          <column type="field" width="-1" hidden="0" name="placement"/>
+          <column type="field" width="-1" hidden="0" name="square"/>
+          <column type="field" width="-1" hidden="0" name="observ"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12661,18 +12851,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="complement"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="observ"/>
-        <field editable="1" name="placement"/>
-        <field editable="1" name="plot_code"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="square"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="text"/>
+        <field name="complement" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="observ" editable="1"/>
+        <field name="placement" editable="1"/>
+        <field name="plot_code" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="square" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="text" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="complement"/>
@@ -12692,7 +12882,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="3000" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiLineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiLineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="1" simplifyLocal="1" simplifyDrawingHints="1" minScale="3000" geometry="Line" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -12751,7 +12941,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -12775,31 +12965,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="0,0,0,51"/>
-              <prop k="line_style" v="dash"/>
-              <prop k="line_width" v="0.6"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="1" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,51" k="line_color"/>
+              <prop v="dash" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12810,79 +13000,79 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Normal" textOrientation="horizontal" textColor="0,0,0,255" fontWeight="50" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontSize="8.25" fontFamily="Arial" isExpression="0" fontCapitals="0" multilineHeight="1" fontWordSpacing="0.1875" fontUnderline="0" fontSizeUnit="Point" blendMode="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0.1875" textOpacity="1" useSubstitutions="0" fontKerning="1" fieldName="name">
-            <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferNoFill="0" bufferOpacity="1" bufferSizeUnits="MM" bufferColor="255,255,255,255"/>
-            <background shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeDraw="0" shapeOpacity="1" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0">
-              <symbol name="markerSymbol" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="152,125,183,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 blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Arial" namedStyle="Normal" fontSizeUnit="Point" textOrientation="horizontal" textColor="0,0,0,255" isExpression="0" textOpacity="1" previewBkgrdColor="255,255,255,255" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fieldName="name" fontSize="8.25" fontKerning="1" fontItalic="0" fontLetterSpacing="0.1875" fontStrikeout="0" fontWordSpacing="0.1875" useSubstitutions="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1" bufferOpacity="1"/>
+            <background shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeJoinStyle="64" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeRadiiX="0" shapeDraw="0" shapeOpacity="1">
+              <symbol type="marker" alpha="1" force_rhr="0" name="markerSymbol" clip_to_extent="1">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                  <prop v="0" k="angle"/>
+                  <prop v="152,125,183,255" k="color"/>
+                  <prop v="1" k="horizontal_anchor_point"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="circle" k="name"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="35,35,35,255" k="outline_color"/>
+                  <prop v="solid" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="diameter" k="scale_method"/>
+                  <prop v="2" k="size"/>
+                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                  <prop v="MM" k="size_unit"/>
+                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowScale="100" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" wrapChar="" leftDirectionSymbol="&lt;" addDirectionSymbol="0" decimals="3" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement repeatDistance="0" centroidWhole="0" overrunDistance="0" distUnits="MM" placement="2" quadOffset="4" priority="5" yOffset="0" dist="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0" preserveRotation="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placementFlags="9" maxCurvedCharAngleIn="25" layerType="LineGeometry" rotationAngle="0" repeatDistanceUnits="MM" offsetType="0" geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
-          <rendering obstacle="1" upsidedownLabels="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" limitNumLabels="0" zIndex="0" displayAll="0" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" drawLabels="1" obstacleFactor="0.6" mergeLines="0" scaleMin="1" labelPerPart="0" obstacleType="0" fontMinPixelSize="3"/>
+          <text-format useMaxLineLengthForAutoWrap="1" autoWrapLength="0" addDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar=""/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" centroidWhole="0" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" layerType="LineGeometry" fitInPolygonOnly="0" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" distUnits="MM" geometryGeneratorEnabled="0" offsetType="0" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" placementFlags="9" centroidInside="0" placement="2" priority="5" repeatDistance="0" overrunDistanceUnit="MM" overrunDistance="0" preserveRotation="1" geometryGeneratorType="PointGeometry"/>
+          <rendering limitNumLabels="0" scaleMax="10000000" mergeLines="0" labelPerPart="0" fontMinPixelSize="3" displayAll="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" scaleMin="1" fontMaxPixelSize="10000" upsidedownLabels="0" drawLabels="1" zIndex="0" obstacleType="0" obstacleFactor="0.6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&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;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;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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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;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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -12896,21 +13086,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="2">
+      <DiagramLayerSettings linePlacementFlags="2" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12919,8 +13109,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12929,19 +13119,18 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="type">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="" type="QString" value=""/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12950,8 +13139,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12960,32 +13149,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="expl_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Undefined" type="QString" value="0"/>
-                  <Option name="expl_01" type="QString" value="1"/>
-                  <Option name="expl_02" type="QString" value="2"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
         <field name="muni_id">
-          <editWidget type="ValueMap">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="map" type="Map">
-                  <Option name="Sant Boi del Llobregat" type="QString" value="1"/>
-                </Option>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12994,8 +13179,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13014,50 +13199,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="code" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="text" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="descript" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="code" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="text" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="descript" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="code" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="text" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descript" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="code" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="text" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="descript" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="text" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="descript" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="code" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="text" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="descript" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="269" type="field"/>
-          <column name="text" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="code" hidden="0" width="-1" type="field"/>
-          <column name="descript" hidden="0" width="-1" type="field"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="type"/>
+          <column type="field" width="269" hidden="0" name="name"/>
+          <column type="field" width="-1" hidden="0" name="text"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" hidden="0" name="code"/>
+          <column type="field" width="-1" hidden="0" name="descript"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13089,14 +13274,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="descript"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="text"/>
-        <field editable="1" name="type"/>
+        <field name="code" editable="1"/>
+        <field name="descript" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="text" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="code"/>
@@ -13112,7 +13297,13 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Polygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1e+08" geometry="Polygon" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_minsector_2a8ec188_4d5b_4a53_9b85_16b3ef4e82e1</id>
       <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='minsector_id' srid=__SRID__ type=Polygon checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_minsector" (the_geom) sql=</datasource>
       <keywordList>
@@ -13165,7 +13356,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13189,26 +13380,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,238,140,95"/>
-              <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,118,29,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.3"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,238,140,95" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,118,29,255" k="outline_color"/>
+              <prop v="dash" k="outline_style"/>
+              <prop v="0.3" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13227,21 +13418,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13250,8 +13441,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13260,8 +13451,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13270,8 +13461,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13280,8 +13471,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13290,8 +13481,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13300,8 +13491,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13318,42 +13509,42 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="minsector_id" applyOnUpdate="0" expression=""/>
-        <default field="dma_id" applyOnUpdate="0" expression=""/>
-        <default field="dqa_id" applyOnUpdate="0" expression=""/>
-        <default field="presszonecat_id" applyOnUpdate="0" expression=""/>
-        <default field="sector_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="minsector_id" expression=""/>
+        <default applyOnUpdate="0" field="dma_id" expression=""/>
+        <default applyOnUpdate="0" field="dqa_id" expression=""/>
+        <default applyOnUpdate="0" field="presszonecat_id" expression=""/>
+        <default applyOnUpdate="0" field="sector_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="minsector_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="dma_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="dqa_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="presszonecat_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="sector_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="minsector_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dma_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="dqa_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="presszonecat_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="sector_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="minsector_id" desc="" exp=""/>
-        <constraint field="dma_id" desc="" exp=""/>
-        <constraint field="dqa_id" desc="" exp=""/>
-        <constraint field="presszonecat_id" desc="" exp=""/>
-        <constraint field="sector_id" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
+        <constraint exp="" field="minsector_id" desc=""/>
+        <constraint exp="" field="dma_id" desc=""/>
+        <constraint exp="" field="dqa_id" desc=""/>
+        <constraint exp="" field="presszonecat_id" desc=""/>
+        <constraint exp="" field="sector_id" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;minsector_id&quot;">
+      <attributetableconfig sortExpression="&quot;minsector_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="minsector_id" hidden="0" width="-1" type="field"/>
-          <column name="dma_id" hidden="0" width="-1" type="field"/>
-          <column name="dqa_id" hidden="0" width="-1" type="field"/>
-          <column name="presszonecat_id" hidden="0" width="-1" type="field"/>
-          <column name="sector_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="minsector_id"/>
+          <column type="field" width="-1" hidden="0" name="dma_id"/>
+          <column type="field" width="-1" hidden="0" name="dqa_id"/>
+          <column type="field" width="-1" hidden="0" name="presszonecat_id"/>
+          <column type="field" width="-1" hidden="0" name="sector_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13385,12 +13576,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="dma_id"/>
-        <field editable="0" name="dqa_id"/>
-        <field editable="0" name="expl_id"/>
-        <field editable="0" name="minsector_id"/>
-        <field editable="0" name="presszonecat_id"/>
-        <field editable="0" name="sector_id"/>
+        <field name="dma_id" editable="0"/>
+        <field name="dqa_id" editable="0"/>
+        <field name="expl_id" editable="0"/>
+        <field name="minsector_id" editable="0"/>
+        <field name="presszonecat_id" editable="0"/>
+        <field name="sector_id" editable="0"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="dma_id"/>
@@ -13404,9 +13595,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>minsector_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="0" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="LineString" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="LineString" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="0" geometry="Line" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13457,7 +13654,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13481,56 +13678,56 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="76,38,0,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.7"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol type="line" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="76,38,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.7" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-              <prop k="capstyle" v="round"/>
-              <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="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="round"/>
-              <prop k="line_color" v="255,206,128,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.5"/>
-              <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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+              <prop v="round" k="capstyle"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="255,206,128,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.5" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13548,21 +13745,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="0" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="0" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="2" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13605,34 +13802,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="arc_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="arc_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="arc_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="arc_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="arc_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="arc_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="arc_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="arc_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13664,10 +13861,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="arc_id"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="arc_id" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="arc_id"/>
@@ -13679,9 +13876,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_cdd04177_e5c9_433b_9828_ba4e651f2c43</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut" (anl_the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -13732,7 +13935,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -13756,33 +13959,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="45,84,255,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="0,24,124,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.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="45,84,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0,24,124,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13800,21 +14003,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14105,158 +14308,158 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="state" applyOnUpdate="0" expression=""/>
-        <default field="class" applyOnUpdate="0" expression=""/>
-        <default field="mincut_type" applyOnUpdate="0" expression=""/>
-        <default field="received_date" applyOnUpdate="0" expression=""/>
-        <default field="expl_id" applyOnUpdate="0" expression=""/>
-        <default field="expl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_name" applyOnUpdate="0" expression=""/>
-        <default field="macroexpl_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_id" applyOnUpdate="0" expression=""/>
-        <default field="muni_name" applyOnUpdate="0" expression=""/>
-        <default field="postcode" applyOnUpdate="0" expression=""/>
-        <default field="streetaxis_id" applyOnUpdate="0" expression=""/>
-        <default field="street_name" applyOnUpdate="0" expression=""/>
-        <default field="postnumber" applyOnUpdate="0" expression=""/>
-        <default field="anl_cause" applyOnUpdate="0" expression=""/>
-        <default field="anl_tstamp" applyOnUpdate="0" expression=""/>
-        <default field="anl_user" applyOnUpdate="0" expression=""/>
-        <default field="anl_descript" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_id" applyOnUpdate="0" expression=""/>
-        <default field="anl_feature_type" applyOnUpdate="0" expression=""/>
-        <default field="forecast_start" applyOnUpdate="0" expression=""/>
-        <default field="forecast_end" applyOnUpdate="0" expression=""/>
-        <default field="assigned_to" applyOnUpdate="0" expression=""/>
-        <default field="exec_start" applyOnUpdate="0" expression=""/>
-        <default field="exec_end" applyOnUpdate="0" expression=""/>
-        <default field="exec_user" applyOnUpdate="0" expression=""/>
-        <default field="exec_descript" applyOnUpdate="0" expression=""/>
-        <default field="exec_the_geom" applyOnUpdate="0" expression=""/>
-        <default field="exec_from_plot" applyOnUpdate="0" expression=""/>
-        <default field="exec_depth" applyOnUpdate="0" expression=""/>
-        <default field="exec_appropiate" applyOnUpdate="0" expression=""/>
-        <default field="notified" applyOnUpdate="0" expression=""/>
-        <default field="output" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="state" expression=""/>
+        <default applyOnUpdate="0" field="class" expression=""/>
+        <default applyOnUpdate="0" field="mincut_type" expression=""/>
+        <default applyOnUpdate="0" field="received_date" expression=""/>
+        <default applyOnUpdate="0" field="expl_id" expression=""/>
+        <default applyOnUpdate="0" field="expl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_name" expression=""/>
+        <default applyOnUpdate="0" field="macroexpl_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_id" expression=""/>
+        <default applyOnUpdate="0" field="muni_name" expression=""/>
+        <default applyOnUpdate="0" field="postcode" expression=""/>
+        <default applyOnUpdate="0" field="streetaxis_id" expression=""/>
+        <default applyOnUpdate="0" field="street_name" expression=""/>
+        <default applyOnUpdate="0" field="postnumber" expression=""/>
+        <default applyOnUpdate="0" field="anl_cause" expression=""/>
+        <default applyOnUpdate="0" field="anl_tstamp" expression=""/>
+        <default applyOnUpdate="0" field="anl_user" expression=""/>
+        <default applyOnUpdate="0" field="anl_descript" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_id" expression=""/>
+        <default applyOnUpdate="0" field="anl_feature_type" expression=""/>
+        <default applyOnUpdate="0" field="forecast_start" expression=""/>
+        <default applyOnUpdate="0" field="forecast_end" expression=""/>
+        <default applyOnUpdate="0" field="assigned_to" expression=""/>
+        <default applyOnUpdate="0" field="exec_start" expression=""/>
+        <default applyOnUpdate="0" field="exec_end" expression=""/>
+        <default applyOnUpdate="0" field="exec_user" expression=""/>
+        <default applyOnUpdate="0" field="exec_descript" expression=""/>
+        <default applyOnUpdate="0" field="exec_the_geom" expression=""/>
+        <default applyOnUpdate="0" field="exec_from_plot" expression=""/>
+        <default applyOnUpdate="0" field="exec_depth" expression=""/>
+        <default applyOnUpdate="0" field="exec_appropiate" expression=""/>
+        <default applyOnUpdate="0" field="notified" expression=""/>
+        <default applyOnUpdate="0" field="output" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="state" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="class" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="mincut_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="received_date" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="expl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="macroexpl_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="muni_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postcode" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="streetaxis_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="street_name" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="postnumber" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_cause" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_tstamp" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="anl_feature_type" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="forecast_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="assigned_to" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_start" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_end" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_user" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_descript" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_the_geom" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_from_plot" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_depth" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="exec_appropiate" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="notified" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="output" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="state" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="class" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="mincut_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="received_date" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="expl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="macroexpl_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="muni_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postcode" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="streetaxis_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="street_name" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="postnumber" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_cause" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_tstamp" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="anl_feature_type" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="forecast_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="assigned_to" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_start" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_end" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_user" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_descript" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_the_geom" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_from_plot" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_depth" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="exec_appropiate" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="notified" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="output" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="state" desc="" exp=""/>
-        <constraint field="class" desc="" exp=""/>
-        <constraint field="mincut_type" desc="" exp=""/>
-        <constraint field="received_date" desc="" exp=""/>
-        <constraint field="expl_id" desc="" exp=""/>
-        <constraint field="expl_name" desc="" exp=""/>
-        <constraint field="macroexpl_name" desc="" exp=""/>
-        <constraint field="macroexpl_id" desc="" exp=""/>
-        <constraint field="muni_id" desc="" exp=""/>
-        <constraint field="muni_name" desc="" exp=""/>
-        <constraint field="postcode" desc="" exp=""/>
-        <constraint field="streetaxis_id" desc="" exp=""/>
-        <constraint field="street_name" desc="" exp=""/>
-        <constraint field="postnumber" desc="" exp=""/>
-        <constraint field="anl_cause" desc="" exp=""/>
-        <constraint field="anl_tstamp" desc="" exp=""/>
-        <constraint field="anl_user" desc="" exp=""/>
-        <constraint field="anl_descript" desc="" exp=""/>
-        <constraint field="anl_feature_id" desc="" exp=""/>
-        <constraint field="anl_feature_type" desc="" exp=""/>
-        <constraint field="forecast_start" desc="" exp=""/>
-        <constraint field="forecast_end" desc="" exp=""/>
-        <constraint field="assigned_to" desc="" exp=""/>
-        <constraint field="exec_start" desc="" exp=""/>
-        <constraint field="exec_end" desc="" exp=""/>
-        <constraint field="exec_user" desc="" exp=""/>
-        <constraint field="exec_descript" desc="" exp=""/>
-        <constraint field="exec_the_geom" desc="" exp=""/>
-        <constraint field="exec_from_plot" desc="" exp=""/>
-        <constraint field="exec_depth" desc="" exp=""/>
-        <constraint field="exec_appropiate" desc="" exp=""/>
-        <constraint field="notified" desc="" exp=""/>
-        <constraint field="output" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="state" desc=""/>
+        <constraint exp="" field="class" desc=""/>
+        <constraint exp="" field="mincut_type" desc=""/>
+        <constraint exp="" field="received_date" desc=""/>
+        <constraint exp="" field="expl_id" desc=""/>
+        <constraint exp="" field="expl_name" desc=""/>
+        <constraint exp="" field="macroexpl_name" desc=""/>
+        <constraint exp="" field="macroexpl_id" desc=""/>
+        <constraint exp="" field="muni_id" desc=""/>
+        <constraint exp="" field="muni_name" desc=""/>
+        <constraint exp="" field="postcode" desc=""/>
+        <constraint exp="" field="streetaxis_id" desc=""/>
+        <constraint exp="" field="street_name" desc=""/>
+        <constraint exp="" field="postnumber" desc=""/>
+        <constraint exp="" field="anl_cause" desc=""/>
+        <constraint exp="" field="anl_tstamp" desc=""/>
+        <constraint exp="" field="anl_user" desc=""/>
+        <constraint exp="" field="anl_descript" desc=""/>
+        <constraint exp="" field="anl_feature_id" desc=""/>
+        <constraint exp="" field="anl_feature_type" desc=""/>
+        <constraint exp="" field="forecast_start" desc=""/>
+        <constraint exp="" field="forecast_end" desc=""/>
+        <constraint exp="" field="assigned_to" desc=""/>
+        <constraint exp="" field="exec_start" desc=""/>
+        <constraint exp="" field="exec_end" desc=""/>
+        <constraint exp="" field="exec_user" desc=""/>
+        <constraint exp="" field="exec_descript" desc=""/>
+        <constraint exp="" field="exec_the_geom" desc=""/>
+        <constraint exp="" field="exec_from_plot" desc=""/>
+        <constraint exp="" field="exec_depth" desc=""/>
+        <constraint exp="" field="exec_appropiate" desc=""/>
+        <constraint exp="" field="notified" desc=""/>
+        <constraint exp="" field="output" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="state" hidden="0" width="-1" type="field"/>
-          <column name="class" hidden="0" width="-1" type="field"/>
-          <column name="mincut_type" hidden="0" width="-1" type="field"/>
-          <column name="received_date" hidden="0" width="-1" type="field"/>
-          <column name="expl_id" hidden="0" width="-1" type="field"/>
-          <column name="expl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_name" hidden="0" width="-1" type="field"/>
-          <column name="macroexpl_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_id" hidden="0" width="-1" type="field"/>
-          <column name="muni_name" hidden="0" width="-1" type="field"/>
-          <column name="postcode" hidden="0" width="-1" type="field"/>
-          <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-          <column name="street_name" hidden="0" width="-1" type="field"/>
-          <column name="postnumber" hidden="0" width="-1" type="field"/>
-          <column name="anl_cause" hidden="0" width="-1" type="field"/>
-          <column name="anl_tstamp" hidden="0" width="-1" type="field"/>
-          <column name="anl_user" hidden="0" width="-1" type="field"/>
-          <column name="anl_descript" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_id" hidden="0" width="-1" type="field"/>
-          <column name="anl_feature_type" hidden="0" width="-1" type="field"/>
-          <column name="forecast_start" hidden="0" width="-1" type="field"/>
-          <column name="forecast_end" hidden="0" width="-1" type="field"/>
-          <column name="assigned_to" hidden="0" width="-1" type="field"/>
-          <column name="exec_start" hidden="0" width="-1" type="field"/>
-          <column name="exec_end" hidden="0" width="-1" type="field"/>
-          <column name="exec_user" hidden="0" width="-1" type="field"/>
-          <column name="exec_descript" hidden="0" width="-1" type="field"/>
-          <column name="exec_the_geom" hidden="0" width="-1" type="field"/>
-          <column name="exec_from_plot" hidden="0" width="-1" type="field"/>
-          <column name="exec_depth" hidden="0" width="-1" type="field"/>
-          <column name="exec_appropiate" hidden="0" width="-1" type="field"/>
-          <column name="notified" hidden="0" width="-1" type="field"/>
-          <column name="output" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="state"/>
+          <column type="field" width="-1" hidden="0" name="class"/>
+          <column type="field" width="-1" hidden="0" name="mincut_type"/>
+          <column type="field" width="-1" hidden="0" name="received_date"/>
+          <column type="field" width="-1" hidden="0" name="expl_id"/>
+          <column type="field" width="-1" hidden="0" name="expl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_name"/>
+          <column type="field" width="-1" hidden="0" name="macroexpl_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_id"/>
+          <column type="field" width="-1" hidden="0" name="muni_name"/>
+          <column type="field" width="-1" hidden="0" name="postcode"/>
+          <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+          <column type="field" width="-1" hidden="0" name="street_name"/>
+          <column type="field" width="-1" hidden="0" name="postnumber"/>
+          <column type="field" width="-1" hidden="0" name="anl_cause"/>
+          <column type="field" width="-1" hidden="0" name="anl_tstamp"/>
+          <column type="field" width="-1" hidden="0" name="anl_user"/>
+          <column type="field" width="-1" hidden="0" name="anl_descript"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_id"/>
+          <column type="field" width="-1" hidden="0" name="anl_feature_type"/>
+          <column type="field" width="-1" hidden="0" name="forecast_start"/>
+          <column type="field" width="-1" hidden="0" name="forecast_end"/>
+          <column type="field" width="-1" hidden="0" name="assigned_to"/>
+          <column type="field" width="-1" hidden="0" name="exec_start"/>
+          <column type="field" width="-1" hidden="0" name="exec_end"/>
+          <column type="field" width="-1" hidden="0" name="exec_user"/>
+          <column type="field" width="-1" hidden="0" name="exec_descript"/>
+          <column type="field" width="-1" hidden="0" name="exec_the_geom"/>
+          <column type="field" width="-1" hidden="0" name="exec_from_plot"/>
+          <column type="field" width="-1" hidden="0" name="exec_depth"/>
+          <column type="field" width="-1" hidden="0" name="exec_appropiate"/>
+          <column type="field" width="-1" hidden="0" name="notified"/>
+          <column type="field" width="-1" hidden="0" name="output"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14288,41 +14491,41 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="anl_cause"/>
-        <field editable="1" name="anl_descript"/>
-        <field editable="1" name="anl_feature_id"/>
-        <field editable="1" name="anl_feature_type"/>
-        <field editable="1" name="anl_tstamp"/>
-        <field editable="1" name="anl_user"/>
-        <field editable="1" name="assigned_to"/>
-        <field editable="1" name="class"/>
-        <field editable="1" name="exec_appropiate"/>
-        <field editable="1" name="exec_depth"/>
-        <field editable="1" name="exec_descript"/>
-        <field editable="1" name="exec_end"/>
-        <field editable="1" name="exec_from_plot"/>
-        <field editable="1" name="exec_start"/>
-        <field editable="1" name="exec_the_geom"/>
-        <field editable="1" name="exec_user"/>
-        <field editable="1" name="expl_id"/>
-        <field editable="1" name="expl_name"/>
-        <field editable="1" name="forecast_end"/>
-        <field editable="1" name="forecast_start"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="macroexpl_id"/>
-        <field editable="1" name="macroexpl_name"/>
-        <field editable="1" name="mincut_type"/>
-        <field editable="1" name="muni_id"/>
-        <field editable="1" name="muni_name"/>
-        <field editable="1" name="notified"/>
-        <field editable="1" name="output"/>
-        <field editable="1" name="postcode"/>
-        <field editable="1" name="postnumber"/>
-        <field editable="1" name="received_date"/>
-        <field editable="1" name="state"/>
-        <field editable="1" name="street_name"/>
-        <field editable="1" name="streetaxis_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="anl_cause" editable="1"/>
+        <field name="anl_descript" editable="1"/>
+        <field name="anl_feature_id" editable="1"/>
+        <field name="anl_feature_type" editable="1"/>
+        <field name="anl_tstamp" editable="1"/>
+        <field name="anl_user" editable="1"/>
+        <field name="assigned_to" editable="1"/>
+        <field name="class" editable="1"/>
+        <field name="exec_appropiate" editable="1"/>
+        <field name="exec_depth" editable="1"/>
+        <field name="exec_descript" editable="1"/>
+        <field name="exec_end" editable="1"/>
+        <field name="exec_from_plot" editable="1"/>
+        <field name="exec_start" editable="1"/>
+        <field name="exec_the_geom" editable="1"/>
+        <field name="exec_user" editable="1"/>
+        <field name="expl_id" editable="1"/>
+        <field name="expl_name" editable="1"/>
+        <field name="forecast_end" editable="1"/>
+        <field name="forecast_start" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="macroexpl_id" editable="1"/>
+        <field name="macroexpl_name" editable="1"/>
+        <field name="mincut_type" editable="1"/>
+        <field name="muni_id" editable="1"/>
+        <field name="muni_name" editable="1"/>
+        <field name="notified" editable="1"/>
+        <field name="output" editable="1"/>
+        <field name="postcode" editable="1"/>
+        <field name="postnumber" editable="1"/>
+        <field name="received_date" editable="1"/>
+        <field name="state" editable="1"/>
+        <field name="street_name" editable="1"/>
+        <field name="streetaxis_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="anl_cause"/>
@@ -14365,9 +14568,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>expl_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14418,7 +14627,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -14442,33 +14651,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="176,123,103,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="102,46,25,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="176,123,103,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="102,46,25,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14486,21 +14695,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14551,38 +14760,38 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
-        <default field="customer_code" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
+        <default applyOnUpdate="0" field="customer_code" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="customer_code" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="customer_code" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
-        <constraint field="customer_code" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
+        <constraint exp="" field="customer_code" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column name="customer_code" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="field" width="-1" hidden="0" name="customer_code"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14614,11 +14823,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="customer_code"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="connec_id" editable="1"/>
+        <field name="customer_code" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -14631,9 +14840,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14684,7 +14899,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -14708,33 +14923,33 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="241,209,66,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="160,134,17,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="241,209,66,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="160,134,17,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14752,21 +14967,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14809,34 +15024,34 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14868,10 +15083,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="work_order"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14883,9 +15098,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1e+08" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="0" simplifyMaxScale="1" autoRefreshTime="0" wkbType="Point" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" wkbType="Point" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="0" minScale="1e+08" geometry="Point" refreshOnNotifyMessage="">
+      <extent>
+        <xmin>__XMIN__</xmin>
+        <ymin>__YMIN__</ymin>
+        <xmax>__XMAX__</xmax>
+        <ymax>__YMAX__</ymax>
+      </extent>
       <id>v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a</id>
-      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__   sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
+      <datasource>dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) sql=</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -14936,7 +15157,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -14960,97 +15181,97 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" attr="proposed" enableorderby="0" type="categorizedSymbol" forceraster="0">
+      <renderer-v2 type="categorizedSymbol" forceraster="0" enableorderby="0" attr="proposed" symbollevels="0">
         <categories>
-          <category render="true" label="Proposed to close" value="true" symbol="0"/>
-          <category render="true" label="Do not operate" value="false" symbol="1"/>
+          <category render="true" value="true" label="Proposed to close" symbol="0"/>
+          <category render="true" value="false" label="Do not operate" symbol="1"/>
         </categories>
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="237,55,58,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="134,13,13,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="237,55,58,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="134,13,13,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="51,160,44,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="6,94,0,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="3.4"/>
-              <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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="1" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="51,160,44,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="6,94,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3.4" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <source-symbol>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="232,113,141,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"/>
+          <symbol type="marker" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+              <prop v="0" k="angle"/>
+              <prop v="232,113,141,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15068,21 +15289,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="0" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15157,50 +15378,50 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="result_id" applyOnUpdate="0" expression=""/>
-        <default field="work_order" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
-        <default field="closed" applyOnUpdate="0" expression=""/>
-        <default field="broken" applyOnUpdate="0" expression=""/>
-        <default field="unaccess" applyOnUpdate="0" expression=""/>
-        <default field="proposed" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="result_id" expression=""/>
+        <default applyOnUpdate="0" field="work_order" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
+        <default applyOnUpdate="0" field="closed" expression=""/>
+        <default applyOnUpdate="0" field="broken" expression=""/>
+        <default applyOnUpdate="0" field="unaccess" expression=""/>
+        <default applyOnUpdate="0" field="proposed" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="result_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="work_order" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="closed" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="broken" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="unaccess" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="proposed" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="result_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="work_order" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="closed" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="broken" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="unaccess" unique_strength="0"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="proposed" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="result_id" desc="" exp=""/>
-        <constraint field="work_order" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
-        <constraint field="closed" desc="" exp=""/>
-        <constraint field="broken" desc="" exp=""/>
-        <constraint field="unaccess" desc="" exp=""/>
-        <constraint field="proposed" desc="" exp=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="result_id" desc=""/>
+        <constraint exp="" field="work_order" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
+        <constraint exp="" field="closed" desc=""/>
+        <constraint exp="" field="broken" desc=""/>
+        <constraint exp="" field="unaccess" desc=""/>
+        <constraint exp="" field="proposed" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="result_id" hidden="0" width="-1" type="field"/>
-          <column name="work_order" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column name="closed" hidden="0" width="-1" type="field"/>
-          <column name="broken" hidden="0" width="-1" type="field"/>
-          <column name="unaccess" hidden="0" width="-1" type="field"/>
-          <column name="proposed" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="id"/>
+          <column type="field" width="-1" hidden="0" name="result_id"/>
+          <column type="field" width="-1" hidden="0" name="work_order"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="field" width="-1" hidden="0" name="closed"/>
+          <column type="field" width="-1" hidden="0" name="broken"/>
+          <column type="field" width="-1" hidden="0" name="unaccess"/>
+          <column type="field" width="-1" hidden="0" name="proposed"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15232,14 +15453,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="broken"/>
-        <field editable="1" name="closed"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="proposed"/>
-        <field editable="1" name="result_id"/>
-        <field editable="1" name="unaccess"/>
-        <field editable="1" name="work_order"/>
+        <field name="broken" editable="1"/>
+        <field name="closed" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="node_id" editable="1"/>
+        <field name="proposed" editable="1"/>
+        <field name="result_id" editable="1"/>
+        <field name="unaccess" editable="1"/>
+        <field name="work_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="broken"/>
@@ -15255,7 +15476,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15314,7 +15535,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15338,26 +15559,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,158,23,117"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,158,23,117" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15375,27 +15596,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -15422,26 +15643,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="connec_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="connec_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="connec_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="connec_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="connec_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="connec_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="connec_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="connec_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15473,8 +15694,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="connec_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="connec_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="connec_id"/>
@@ -15484,7 +15705,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15543,7 +15764,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15567,26 +15788,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="72,109,183,124"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="72,109,183,124" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15604,27 +15825,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -15651,26 +15872,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15702,8 +15923,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -15713,7 +15934,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>pol_id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" minScale="1500" type="vector" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyLocal="1" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="1" hasScaleBasedVisibilityFlag="1" maxScale="0" simplifyDrawingHints="1" simplifyMaxScale="1" autoRefreshTime="0" wkbType="MultiPolygon" refreshOnNotifyMessage="" autoRefreshEnabled="0">
+    <maplayer refreshOnNotifyEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="1" wkbType="MultiPolygon" maxScale="0" autoRefreshEnabled="0" type="vector" labelsEnabled="0" simplifyLocal="1" simplifyDrawingHints="1" minScale="1500" geometry="Polygon" refreshOnNotifyMessage="">
       <extent>
         <xmin>__XMIN__</xmin>
         <ymin>__YMIN__</ymin>
@@ -15772,7 +15993,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" miny="0" crs="EPSG:25831" maxx="0" maxz="0"/>
+          <spatial dimensions="2" minx="0" minz="0" maxx="0" maxz="0" miny="0" maxy="0" crs="EPSG:25831"/>
           <temporal>
             <period>
               <start></start>
@@ -15796,26 +16017,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
         <symbols>
-          <symbol name="0" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="120,207,43,119"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="0" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="120,207,43,119" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15833,27 +16054,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" minScaleDenominator="0" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
-          <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-          <attribute color="#000000" label="" field=""/>
+        <DiagramCategory scaleDependency="Area" penWidth="0" width="15" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" rotationOffset="270" backgroundAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" diagramOrientation="Up" barWidth="5" lineSizeType="MM" opacity="1" sizeType="MM" penAlpha="255" minScaleDenominator="0" height="15" scaleBasedVisibility="0">
+          <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" obstacle="0" placement="1" zIndex="0" showAll="1" linePlacementFlags="18">
+      <DiagramLayerSettings linePlacementFlags="18" obstacle="0" zIndex="0" showAll="1" dist="0" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -15880,26 +16101,26 @@ def my_form_open(dialog, layer, feature):
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pol_id" applyOnUpdate="0" expression=""/>
-        <default field="node_id" applyOnUpdate="0" expression=""/>
+        <default applyOnUpdate="0" field="pol_id" expression=""/>
+        <default applyOnUpdate="0" field="node_id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" field="pol_id" notnull_strength="1" constraints="3" exp_strength="0"/>
-        <constraint unique_strength="0" field="node_id" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="3" exp_strength="0" notnull_strength="1" field="pol_id" unique_strength="1"/>
+        <constraint constraints="0" exp_strength="0" notnull_strength="0" field="node_id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pol_id" desc="" exp=""/>
-        <constraint field="node_id" desc="" exp=""/>
+        <constraint exp="" field="pol_id" desc=""/>
+        <constraint exp="" field="node_id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="pol_id" hidden="0" width="-1" type="field"/>
-          <column name="node_id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column type="field" width="-1" hidden="0" name="pol_id"/>
+          <column type="field" width="-1" hidden="0" name="node_id"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15931,8 +16152,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>2</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="node_id"/>
-        <field editable="1" name="pol_id"/>
+        <field name="node_id" editable="1"/>
+        <field name="pol_id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="node_id"/>
@@ -15977,14 +16198,14 @@ def my_form_open(dialog, layer, feature):
       <savedQueries>
         <q-1367858423>
           <name type="QString">sdfeaf</name>
-          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+          <query type="QString">SELECT link.link_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.connec_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.vnode_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+st_length2d(link.the_geom) AS gis_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.custom_length,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+connec.connecat_id,&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+link.the_geom&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+FROM (sample_epanet.link&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id)::text)));</query>
         </q-1367858423>
       </savedQueries>
@@ -16675,63 +16896,63 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="composer_plan" units="mm" worldFileMap="" printResolution="300">
-      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
-      <Grid offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" units="mm" name="composer_plan">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetX="0" offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" referencePoint="0" groupUuid="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" blendMode="0" position="0,0,mm" zValue="0" frameJoinStyle="miter" visibility="1" id="" size="210,297,mm" positionOnPage="0,0,mm" itemRotation="0" background="true">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem blendMode="0" positionOnPage="0,0,mm" frameJoinStyle="miter" referencePoint="0" excludeFromExports="0" size="210,297,mm" id="" templateUuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" position="0,0,mm" background="true" type="65638" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="0" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4a3fc51e-cef7-4112-8843-0846c54b5203}" opacity="1">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16739,446 +16960,446 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" svgBorderWidth="0.2" frame="false" anchorPoint="0" pictureWidth="8.01076" excludeFromExports="0" svgBorderColor="0,0,0,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" pictureRotation="0" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png" resizeMode="0" blendMode="0" position="21.2488,12.0899,mm" zValue="34" pictureHeight="8.05991" frameJoinStyle="miter" mapUuid="" visibility="1" svgFillColor="255,255,255,255" id="" size="52.9371,8.05991,mm" northMode="0" positionOnPage="21.2488,12.0899,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="21.2488,12.0899,mm" pictureHeight="8.05991" pictureWidth="41.4053" svgBorderColor="0,0,0,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="" anchorPoint="0" size="52.9371,8.05991,mm" id="" templateUuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" svgFillColor="255,255,255,255" position="21.2488,12.0899,mm" background="false" svgBorderWidth="0.2" type="65640" positionLock="false" visibility="1" pictureRotation="0" groupUuid="" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{0e13f33c-a2fb-48c2-bea1-ef81a72da343}" opacity="1" file="../../../AppData/Roaming/QGIS/QGIS3/profiles/default/python/plugins/giswater/templates/qgiscomposer/en/logo.png">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" labelText="Planified network:  [% &quot;plan_length&quot; %] m." halign="1" blendMode="0" position="18.5098,248.929,mm" zValue="34" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,248.929,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,248.929,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Planified network:  [% &quot;plan_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" position="18.5098,248.929,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="34" itemRotation="0" outlineWidthM="0.3,mm" uuid="{beac8177-2158-4168-bf98-1c7c960e1d1b}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" labelText="Affected network:  [% &quot;affec_length&quot; %] m." halign="1" blendMode="0" position="18.5098,240.85,mm" zValue="33" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="98.6069,5.60773,mm" positionOnPage="18.5098,240.85,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,240.85,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Affected network:  [% &quot;affec_length&quot; %] m." excludeFromExports="0" size="98.6069,5.60773,mm" id="" templateUuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" position="18.5098,240.85,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="33" itemRotation="0" outlineWidthM="0.3,mm" uuid="{42fcc677-a640-438e-8112-c1dfc7c589f2}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" halign="2" blendMode="0" position="130.06,170.278,mm" zValue="32" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="130.06,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="130.06,170.278,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_other&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" position="130.06,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="32" itemRotation="0" outlineWidthM="0.3,mm" uuid="{14b5623a-0dde-49b7-b996-37e4f8ffb3ac}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" halign="2" blendMode="0" position="129.892,162.595,mm" zValue="31" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.892,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,162.595,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_node&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" position="129.892,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="31" itemRotation="0" outlineWidthM="0.3,mm" uuid="{cd4a0e8f-b6aa-469e-97bb-3fac4e6c5d9d}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" halign="2" blendMode="0" position="129.892,154.849,mm" zValue="30" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.892,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.892,154.849,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;total_arc&quot; ,2)%]  €&#xa;" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" position="129.892,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="30" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2af4baee-7356-4177-ae6e-099b6d1067fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" blendMode="0" position="18.5119,237.417,mm" zValue="29" frameJoinStyle="miter" visibility="1" id="" size="107.352,0.232607,mm" positionOnPage="18.5119,237.417,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5119,237.417,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="107.352,0.232607,mm" id="" templateUuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" position="18.5119,237.417,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="29" itemRotation="0" outlineWidthM="0.3,mm" uuid="{c856aa0f-9d24-4c60-976a-4bf7b8d1bd47}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" labelText="Total cost of other works:" halign="1" blendMode="0" position="18.472,170.278,mm" zValue="28" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.07458,mm" positionOnPage="18.472,170.278,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,170.278,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost of other works:" excludeFromExports="0" size="55.7139,5.07458,mm" id="" templateUuid="{d766f049-ae03-40c0-9957-a0446b767407}" position="18.472,170.278,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="28" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d766f049-ae03-40c0-9957-a0446b767407}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" blendMode="0" position="18.472,180.075,mm" zValue="27" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,180.075,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,180.075,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" position="18.472,180.075,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="27" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d085d8d2-4192-4676-ad2c-0c0f53dd66d6}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,191.26,mm" zValue="26" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.52331,mm" positionOnPage="129.798,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,191.26,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pec_vat&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.52331,mm" id="" templateUuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" position="129.798,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="26" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4e35a928-6f03-46bc-b6ee-0c5fb7490356}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" halign="2" blendMode="0" position="129.798,184.169,mm" zValue="25" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,4.77795,mm" positionOnPage="129.798,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="129.798,184.169,mm" marginX="0" halign="2" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="[% format_number ( &quot;pem&quot; ,2)%]  €" excludeFromExports="0" size="63.839,4.77795,mm" id="" templateUuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" position="129.798,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="25" itemRotation="0" outlineWidthM="0.3,mm" uuid="{48f8f702-b546-4750-a59e-0e1edc2a9d28}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" halign="1" blendMode="0" position="18.5098,144.841,mm" zValue="24" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="97.7075,5.87319,mm" positionOnPage="18.5098,144.841,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.5098,144.841,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget summary of [% &quot;name&quot; %]:" excludeFromExports="0" size="97.7075,5.87319,mm" id="" templateUuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" position="18.5098,144.841,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="24" itemRotation="0" outlineWidthM="0.3,mm" uuid="{de426041-f9c2-42f8-85e1-2eec4605de4a}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" labelText="Total cost for node elements:" halign="1" blendMode="0" position="18.472,162.595,mm" zValue="23" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="55.7139,5.87319,mm" positionOnPage="18.472,162.595,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,162.595,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for node elements:" excludeFromExports="0" size="55.7139,5.87319,mm" id="" templateUuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" position="18.472,162.595,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="23" itemRotation="0" outlineWidthM="0.3,mm" uuid="{473a21ef-4c2e-45f2-bd87-defc1ba03526}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" blendMode="0" position="18.4712,202.127,mm" zValue="22" frameJoinStyle="miter" visibility="1" id="" size="178.105,0.232607,mm" positionOnPage="18.4712,202.127,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,202.127,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.105,0.232607,mm" id="" templateUuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" position="18.4712,202.127,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="22" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9d4539bf-dbbc-4692-9073-4a58b9bf2d39}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" blendMode="0" position="18.472,149.994,mm" zValue="21" frameJoinStyle="miter" visibility="1" id="" size="177.254,0.21446,mm" positionOnPage="18.472,149.994,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,149.994,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="177.254,0.21446,mm" id="" templateUuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" position="18.472,149.994,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="21" itemRotation="0" outlineWidthM="0.3,mm" uuid="{607e462a-2c3b-41ab-bf4d-89cccf36ed98}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" blendMode="0" position="17.1613,8.922,mm" zValue="19" frameJoinStyle="miter" visibility="1" id="" size="0.851544,16.1039,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="0.851544,16.1039,mm" id="" templateUuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="19" itemRotation="0" outlineWidthM="0.3,mm" uuid="{822cfe22-6e46-499d-88aa-a4c35fe18f09}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" blendMode="0" position="17.1613,8.922,mm" zValue="18" frameJoinStyle="miter" visibility="1" id="" size="179.415,0.863719,mm" positionOnPage="17.1613,8.922,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,8.922,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,0.863719,mm" id="" templateUuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" position="17.1613,8.922,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="18" itemRotation="0" outlineWidthM="0.3,mm" uuid="{d171dc24-a845-4cc1-9f84-3c99659f8b7e}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="true" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" mapFlags="0" blendMode="0" position="131.014,237.517,mm" zValue="17" frameJoinStyle="miter" visibility="1" followPreset="false" id="" size="65.4621,46.5539,mm" keepLayerSet="true" positionOnPage="131.014,237.517,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="131.014,237.517,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="true" excludeFromExports="0" size="65.4621,46.5539,mm" id="" mapRotation="0" templateUuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" position="131.014,237.517,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="17" itemRotation="0" outlineWidthM="0.2,mm" uuid="{887f0dfa-168e-40b6-9063-6589fc57608c}" opacity="1" drawCanvasItems="true" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4577071.35527538601309061" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymin="4576100.62452332023531199"/>
+        <Extent ymin="4576100.62452332023531199" xmax="419842.63581420265836641" xmin="418477.63581281033111736" ymax="4577071.35527538601309061"/>
         <LayerSet>
-          <Layer name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres">v_edit_dimensions20170628134034849</Layer>
-          <Layer name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres">v_edit_samplepoint20170619120830016</Layer>
-          <Layer name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres">ext_municipality20171204170633784</Layer>
-          <Layer name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres">v_ext_address20180201103159332</Layer>
-          <Layer name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres">v_ext_plot20180201103159443</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning">v_edit_dimensions20170628134034849</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point">v_edit_samplepoint20170619120830016</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality">ext_municipality20171204170633784</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address">v_ext_address20180201103159332</Layer>
+          <Layer source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot">v_ext_plot20180201103159443</Layer>
         </LayerSet>
         <LayerStyles>
-          <LayerStyle name="Municipality" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" layerid="ext_municipality20171204170633784">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='muni_id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;ext_municipality&quot; (the_geom) sql=" provider="postgres" name="Municipality" layerid="ext_municipality20171204170633784">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="44,122,211,0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="129,10,78,255"/>
-                      <prop k="outline_style" v="dot"/>
-                      <prop k="outline_width" v="0.66"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="44,122,211,0" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="129,10,78,255" k="outline_color"/>
+                      <prop v="dot" k="outline_style"/>
+                      <prop v="0.66" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -17338,66 +17559,66 @@ LEFT JOIN sample_epanet.connec ON (((connec.connec_id)::text = (link.connec_id):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="muni_id" name="" index="0"/>
-                <alias field="name" name="" index="1"/>
-                <alias field="observ" name="" index="2"/>
+                <alias name="" field="muni_id" index="0"/>
+                <alias name="" field="name" index="1"/>
+                <alias name="" field="observ" index="2"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="name" hidden="0" width="183" type="field"/>
-                  <column name="observ" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="183" hidden="0" name="name"/>
+                  <column type="field" width="-1" hidden="0" name="observ"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -17429,442 +17650,442 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="muni_id" expression=""/>
-                <default field="name" expression=""/>
-                <default field="observ" expression=""/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="name"/>
+                <default expression="" field="observ"/>
               </defaults>
               <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Dimensioning" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_dimensions20170628134034849">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_dimensions&quot; (the_geom) sql=" provider="postgres" name="Dimensioning" layerid="v_edit_dimensions20170628134034849">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="distance">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="depth">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="offset_label">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="direction_arrow">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="x_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="y_symbol">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_type">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="state">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+              <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
                 <rules key="{b18770de-b6b2-42fd-b5b8-15a4525e69df}">
-                  <rule scalemindenom="1" key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemaxdenom="600" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " symbol="0"/>
-                  <rule scalemindenom="1" key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2" symbol="1"/>
-                  <rule scalemindenom="600" key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemaxdenom="1600" symbol="2"/>
+                  <rule key="{f3df62ec-25cc-4cfa-8bda-d4a75f1bfda1}" scalemindenom="1" filter="&quot;distance&quot; is null or &quot;distance&quot;  > 2 " scalemaxdenom="600" symbol="0"/>
+                  <rule key="{9f40a0ac-0ac4-49b5-be82-e23ba6ef56b9}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2" scalemaxdenom="600" symbol="1"/>
+                  <rule key="{d225b0c8-a9cb-4ab2-9622-363eed8bac13}" scalemindenom="600" scalemaxdenom="1600" symbol="2"/>
                 </rules>
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@0@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="1" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="1" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,255"/>
-                      <prop k="line_style" v="solid"/>
-                      <prop k="line_width" v="0.2"/>
-                      <prop k="line_width_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.2" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@1" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="255,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="line"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="255,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="line" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="lastvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="lastvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="180"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot;"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="180" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot;" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="firstvertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@1@3" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="firstvertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="color" v="0,0,0,255"/>
-                          <prop k="horizontal_anchor_point" v="1"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="name" v="arrowhead"/>
-                          <prop k="offset" v="0,-0.00000000000000006"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.2"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="3"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MM"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0,0,0,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="arrowhead" k="name"/>
+                          <prop v="0,-0.00000000000000006" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.2" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="3" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MM" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                   </symbol>
-                  <symbol name="2" alpha="1" clip_to_extent="1" type="line">
+                  <symbol type="line" alpha="1" name="2" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleLine">
-                      <prop k="capstyle" v="square"/>
-                      <prop k="customdash" v="5;2"/>
-                      <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="customdash_unit" v="MM"/>
-                      <prop k="draw_inside_polygon" v="0"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="use_custom_dash" v="0"/>
-                      <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                      <prop v="square" k="capstyle"/>
+                      <prop v="5;2" k="customdash"/>
+                      <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                      <prop v="MM" k="customdash_unit"/>
+                      <prop v="0" k="draw_inside_polygon"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0,0,255" k="line_color"/>
+                      <prop v="solid" k="line_style"/>
+                      <prop v="0.26" k="line_width"/>
+                      <prop v="MM" k="line_width_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0" k="use_custom_dash"/>
+                      <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))"/>
-                      <symbol name="@2@1" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" difference( make_line(   end_point(  $geometry ), make_point(  &quot;x_symbol&quot;  , &quot;y_symbol&quot;   )), buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@1" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="66,66,66,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="66,66,66,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="MarkerLine">
-                      <prop k="interval" v="3"/>
-                      <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="interval_unit" v="MM"/>
-                      <prop k="offset" v="0"/>
-                      <prop k="offset_along_line" v="0"/>
-                      <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_along_line_unit" v="MM"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="placement" v="vertex"/>
-                      <prop k="rotate" v="1"/>
-                      <symbol name="@2@2" alpha="1" clip_to_extent="1" type="marker">
+                      <prop v="3" k="interval"/>
+                      <prop v="0,0,0,0,0,0" k="interval_map_unit_scale"/>
+                      <prop v="MM" k="interval_unit"/>
+                      <prop v="0" k="offset"/>
+                      <prop v="0" k="offset_along_line"/>
+                      <prop v="0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
+                      <prop v="MM" k="offset_along_line_unit"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="vertex" k="placement"/>
+                      <prop v="1" k="rotate"/>
+                      <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleMarker">
-                          <prop k="angle" v="0"/>
-                          <prop k="angle_dd_active" v="0"/>
-                          <prop k="angle_dd_expression" v="&quot;arrow&quot; +180"/>
-                          <prop k="angle_dd_field" v=""/>
-                          <prop k="angle_dd_useexpr" v="1"/>
-                          <prop k="color" v="142,139,143,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="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="solid"/>
-                          <prop k="outline_width" v="0"/>
-                          <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="scale_method" v="diameter"/>
-                          <prop k="size" v="0.8"/>
-                          <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="size_unit" v="MapUnit"/>
-                          <prop k="vertical_anchor_point" v="1"/>
+                          <prop v="0" k="angle"/>
+                          <prop v="0" k="angle_dd_active"/>
+                          <prop v="&quot;arrow&quot; +180" k="angle_dd_expression"/>
+                          <prop v="" k="angle_dd_field"/>
+                          <prop v="1" k="angle_dd_useexpr"/>
+                          <prop v="142,139,143,255" k="color"/>
+                          <prop v="1" k="horizontal_anchor_point"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="circle" k="name"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0" k="outline_width"/>
+                          <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="diameter" k="scale_method"/>
+                          <prop v="0.8" k="size"/>
+                          <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                          <prop v="MapUnit" k="size_unit"/>
+                          <prop v="1" k="vertical_anchor_point"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Fill"/>
-                      <prop k="geometryModifier" v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)"/>
-                      <symbol name="@2@3" alpha="1" clip_to_extent="1" type="fill">
+                      <prop v="Fill" k="SymbolType"/>
+                      <prop v=" buffer( make_point(  &quot;x_symbol&quot;  ,  &quot;y_symbol&quot;  ),4)" k="geometryModifier"/>
+                      <symbol type="fill" alpha="1" name="@2@3" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleFill">
-                          <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="color" v="255,255,255,255"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="offset" v="0,0"/>
-                          <prop k="offset_map_unit_scale" v="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="solid"/>
-                          <prop k="outline_width" v="0.26"/>
-                          <prop k="outline_width_unit" v="MM"/>
-                          <prop k="style" v="solid"/>
+                          <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                          <prop v="255,255,255,255" k="color"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0,0,0,255" k="outline_color"/>
+                          <prop v="solid" k="outline_style"/>
+                          <prop v="0.26" k="outline_width"/>
+                          <prop v="MM" k="outline_width_unit"/>
+                          <prop v="solid" k="style"/>
                         </layer>
                       </symbol>
                     </layer>
                     <layer locked="0" pass="0" class="GeometryGenerator">
-                      <prop k="SymbolType" v="Line"/>
-                      <prop k="geometryModifier" v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))"/>
-                      <symbol name="@2@4" alpha="1" clip_to_extent="1" type="line">
+                      <prop v="Line" k="SymbolType"/>
+                      <prop v=" make_line(  make_point(  &quot;x_symbol&quot; -4,  &quot;y_symbol&quot; ),  make_point(  &quot;x_symbol&quot; +4, &quot;y_symbol&quot; ))" k="geometryModifier"/>
+                      <symbol type="line" alpha="1" name="@2@4" clip_to_extent="1">
                         <layer locked="0" pass="0" class="SimpleLine">
-                          <prop k="capstyle" v="square"/>
-                          <prop k="customdash" v="5;2"/>
-                          <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-                          <prop k="customdash_unit" v="MM"/>
-                          <prop k="draw_inside_polygon" v="0"/>
-                          <prop k="joinstyle" v="bevel"/>
-                          <prop k="line_color" v="0,0,0,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="0,0,0,0,0,0"/>
-                          <prop k="offset_unit" v="MM"/>
-                          <prop k="use_custom_dash" v="0"/>
-                          <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
+                          <prop v="square" k="capstyle"/>
+                          <prop v="5;2" k="customdash"/>
+                          <prop v="0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                          <prop v="MM" k="customdash_unit"/>
+                          <prop v="0" k="draw_inside_polygon"/>
+                          <prop v="bevel" k="joinstyle"/>
+                          <prop v="0,0,0,255" k="line_color"/>
+                          <prop v="solid" k="line_style"/>
+                          <prop v="0.26" k="line_width"/>
+                          <prop v="MM" k="line_width_unit"/>
+                          <prop v="0" k="offset"/>
+                          <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                          <prop v="MM" k="offset_unit"/>
+                          <prop v="0" k="use_custom_dash"/>
+                          <prop v="0,0,0,0,0,0" k="width_map_unit_scale"/>
                         </layer>
                       </symbol>
                     </layer>
@@ -17873,143 +18094,143 @@ def my_form_open(dialog, layer, feature):
               </renderer-v2>
               <labeling type="rule-based">
                 <rules key="{44842891-4da4-4b5c-a99a-17f1f72cac5d}">
-                  <rule scalemindenom="1" key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null">
+                  <rule key="{371a6291-85a8-434f-9a0e-7d73c7cf48dd}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null">
+                  <rule key="{a02614ca-f886-49d8-9915-1d17108b607a}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is not null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '('||  &quot;depth&quot; ||')'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemaxdenom="1600" filter="&quot;depth&quot; is not null">
+                  <rule key="{8fc1354b-39d9-4865-bf68-a6a9f99d4a6a}" scalemindenom="600" filter="&quot;depth&quot; is not null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot;,2) || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemaxdenom="600" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null">
+                  <rule key="{e3c3ebea-1ce2-4870-93a0-605fb4debf4c}" scalemindenom="1" filter=" &quot;distance&quot; &lt; 2 and &quot;depth&quot; is  null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="1" key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemaxdenom="600" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null">
+                  <rule key="{907be6e8-465c-417c-b907-b2e78459e47e}" scalemindenom="1" filter=" &quot;distance&quot; >2 and &quot;depth&quot; is null" scalemaxdenom="600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="8.25" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="0" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="0" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(  &quot;distance&quot; ,2)  || '&amp;' || '()'" fontSize="8.25" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="2" placement="2" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="1" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="2" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="2" placementFlags="1" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="" field="x_label" useExpr="false" active="true"/>
-                        <PositionY expr="&quot;y_label&quot; -1" field="y_label" useExpr="false" active="true"/>
-                        <Rotation expr="" field="rotation_label" useExpr="false" active="true"/>
+                        <PositionX expr="" active="true" field="x_label" useExpr="false"/>
+                        <PositionY expr="&quot;y_label&quot; -1" active="true" field="y_label" useExpr="false"/>
+                        <Rotation expr="" active="true" field="rotation_label" useExpr="false"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemaxdenom="1600" filter="&quot;depth&quot; is null">
+                  <rule key="{73c21436-0f61-4cec-b7a5-fb5133fabd1f}" scalemindenom="600" filter="&quot;depth&quot; is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName=" format_number(&quot;distance&quot; ,2) || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null">
+                  <rule key="{1ca1b50b-5b9d-4b34-b93e-b59a42933281}" scalemindenom="600" filter=" &quot;distance&quot;  is null" scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '('|| &quot;depth&quot; ||')'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot;  - 2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
-                  <rule scalemindenom="600" key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemaxdenom="1600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null ">
+                  <rule key="{18652a63-ddf5-4df8-9ca5-37fdef9186f9}" scalemindenom="600" filter=" &quot;distance&quot;  is null and  &quot;depth&quot; is null " scalemaxdenom="1600">
                     <settings>
-                      <text-style namedStyle="Light" textColor="0,0,0,255" fontWeight="25" fontStrikeout="0" previewBkgrdColor="#ffffff" fontSize="2.3" fontFamily="Calibri Light" isExpression="1" fontCapitals="0" fontWordSpacing="0" fontUnderline="0" blendMode="0" fontItalic="0" textTransp="0" fontSizeInMapUnits="1" fontSizeMapUnitScale="0,0,0,0,0,0" fontLetterSpacing="0" useSubstitutions="0" fieldName="'-' || '&amp;' || '()'">
+                      <text-style blendMode="0" fontUnderline="0" fontCapitals="0" fontFamily="Calibri Light" namedStyle="Light" textColor="0,0,0,255" fontSizeInMapUnits="1" isExpression="1" previewBkgrdColor="#ffffff" textTransp="0" fontWeight="25" fontSizeMapUnitScale="0,0,0,0,0,0" fieldName="'-' || '&amp;' || '()'" fontSize="2.3" fontItalic="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" useSubstitutions="0">
                         <substitutions/>
                       </text-style>
-                      <text-format wrapChar="&amp;" leftDirectionSymbol="&lt;" multilineHeight="1" addDirectionSymbol="0" decimals="3" multilineAlign="1" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" placeDirectionSymbol="0"/>
-                      <text-buffer bufferSizeInMapUnits="0" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferTransp="0"/>
-                      <background shapeOffsetUnits="1" shapeBlendMode="0" shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeUnits="1" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiUnits="1" shapeBorderWidthUnits="1" shapeDraw="0" shapeTransparency="0" shapeSizeType="0" shapeRadiiX="0" shapeOffsetX="0" shapeRotationType="0" shapeType="0"/>
-                      <shadow shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnits="1" shadowRadiusUnits="1" shadowTransparency="30"/>
-                      <placement distInMapUnits="0" repeatDistance="0" centroidWhole="0" angleOffset="0" repeatDistanceUnit="1" placement="4" priority="5" quadOffset="4" yOffset="0" maxCurvedCharAngleOut="-25" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" labelOffsetMapUnitScale="0,0,0,0,0,0" xOffset="0" fitInPolygonOnly="0" preserveRotation="1" distMapUnitScale="0,0,0,0,0,0" labelOffsetInMapUnits="1" placementFlags="10" maxCurvedCharAngleIn="25" offsetType="0" repeatDistanceMapUnitScale="0,0,0,0,0,0"/>
-                      <rendering scaleMax="10000000" upsidedownLabels="0" fontMinPixelSize="3" maxNumLabels="2000" minFeatureSize="0" obstacleType="0" scaleVisibility="0" displayAll="0" obstacle="1" obstacleFactor="1" limitNumLabels="0" scaleMin="1" fontLimitPixelSize="0" mergeLines="0" zIndex="0" fontMaxPixelSize="10000" labelPerPart="0"/>
+                      <text-format addDirectionSymbol="0" decimals="3" multilineHeight="1" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="&amp;"/>
+                      <text-buffer bufferTransp="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferNoFill="0" bufferSizeInMapUnits="0" bufferDraw="0" bufferSizeMapUnitScale="0,0,0,0,0,0" bufferBlendMode="0" bufferSize="1"/>
+                      <background shapeRadiiMapUnitScale="0,0,0,0,0,0" shapeBorderWidth="0" shapeSizeType="0" shapeSizeY="0" shapeSizeX="0" shapeSizeUnits="1" shapeOffsetUnits="1" shapeBorderWidthMapUnitScale="0,0,0,0,0,0" shapeType="0" shapeSVGFile="" shapeSizeMapUnitScale="0,0,0,0,0,0" shapeBlendMode="0" shapeBorderWidthUnits="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeRadiiY="0" shapeRotationType="0" shapeTransparency="0" shapeOffsetMapUnitScale="0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnits="1" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeRadiiX="0"/>
+                      <shadow shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="0,0,0,0,0,0" shadowUnder="0" shadowDraw="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnits="1" shadowScale="100" shadowRadiusUnits="1" shadowRadiusMapUnitScale="0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowTransparency="30"/>
+                      <placement labelOffsetMapUnitScale="0,0,0,0,0,0" distInMapUnits="0" xOffset="0" repeatDistanceUnit="1" maxCurvedCharAngleIn="25" centroidWhole="0" distMapUnitScale="0,0,0,0,0,0" dist="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="0,0,0,0,0,0" quadOffset="4" maxCurvedCharAngleOut="-25" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" priority="5" placement="4" placementFlags="10" repeatDistance="0" labelOffsetInMapUnits="1" angleOffset="0" preserveRotation="1"/>
+                      <rendering upsidedownLabels="0" fontLimitPixelSize="0" mergeLines="0" minFeatureSize="0" limitNumLabels="0" displayAll="0" maxNumLabels="2000" obstacle="1" scaleVisibility="0" obstacleType="0" zIndex="0" scaleMin="1" labelPerPart="0" fontMaxPixelSize="10000" obstacleFactor="1" scaleMax="10000000" fontMinPixelSize="3"/>
                       <data-defined>
-                        <PositionX expr="&quot;x_symbol&quot; -2.5" field="x_symbol" useExpr="true" active="true"/>
-                        <PositionY expr="&quot;y_symbol&quot; -2.5" field="y_symbol" useExpr="true" active="true"/>
+                        <PositionX expr="&quot;x_symbol&quot; -2.5" active="true" field="x_symbol" useExpr="true"/>
+                        <PositionY expr="&quot;y_symbol&quot; -2.5" active="true" field="y_symbol" useExpr="true"/>
                       </data-defined>
                     </settings>
                   </rule>
@@ -18169,88 +18390,88 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Etiqueta"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Pie">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,7.5,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="2" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="2"/>
               <annotationform>.</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="distance" name="" index="1"/>
-                <alias field="depth" name="" index="2"/>
-                <alias field="x_label" name="" index="3"/>
-                <alias field="y_label" name="" index="4"/>
-                <alias field="rotation_label" name="" index="5"/>
-                <alias field="offset_label" name="" index="6"/>
-                <alias field="direction_arrow" name="" index="7"/>
-                <alias field="x_symbol" name="" index="8"/>
-                <alias field="y_symbol" name="" index="9"/>
-                <alias field="feature_id" name="" index="10"/>
-                <alias field="feature_type" name="" index="11"/>
-                <alias field="state" name="" index="12"/>
-                <alias field="expl_id" name="" index="13"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="distance" index="1"/>
+                <alias name="" field="depth" index="2"/>
+                <alias name="" field="x_label" index="3"/>
+                <alias name="" field="y_label" index="4"/>
+                <alias name="" field="rotation_label" index="5"/>
+                <alias name="" field="offset_label" index="6"/>
+                <alias name="" field="direction_arrow" index="7"/>
+                <alias name="" field="x_symbol" index="8"/>
+                <alias name="" field="y_symbol" index="9"/>
+                <alias name="" field="feature_id" index="10"/>
+                <alias name="" field="feature_type" index="11"/>
+                <alias name="" field="state" index="12"/>
+                <alias name="" field="expl_id" index="13"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+              <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="distance" hidden="0" width="-1" type="field"/>
-                  <column name="depth" hidden="0" width="-1" type="field"/>
-                  <column name="x_label" hidden="0" width="-1" type="field"/>
-                  <column name="y_label" hidden="0" width="-1" type="field"/>
-                  <column name="rotation_label" hidden="0" width="-1" type="field"/>
-                  <column name="offset_label" hidden="0" width="-1" type="field"/>
-                  <column name="direction_arrow" hidden="0" width="-1" type="field"/>
-                  <column name="x_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="y_symbol" hidden="0" width="-1" type="field"/>
-                  <column name="feature_id" hidden="0" width="-1" type="field"/>
-                  <column name="feature_type" hidden="0" width="-1" type="field"/>
-                  <column name="state" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="distance"/>
+                  <column type="field" width="-1" hidden="0" name="depth"/>
+                  <column type="field" width="-1" hidden="0" name="x_label"/>
+                  <column type="field" width="-1" hidden="0" name="y_label"/>
+                  <column type="field" width="-1" hidden="0" name="rotation_label"/>
+                  <column type="field" width="-1" hidden="0" name="offset_label"/>
+                  <column type="field" width="-1" hidden="0" name="direction_arrow"/>
+                  <column type="field" width="-1" hidden="0" name="x_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="y_symbol"/>
+                  <column type="field" width="-1" hidden="0" name="feature_id"/>
+                  <column type="field" width="-1" hidden="0" name="feature_type"/>
+                  <column type="field" width="-1" hidden="0" name="state"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui</editform>
@@ -18282,151 +18503,151 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="distance" expression=""/>
-                <default field="depth" expression=""/>
-                <default field="x_label" expression=""/>
-                <default field="y_label" expression=""/>
-                <default field="rotation_label" expression=""/>
-                <default field="offset_label" expression=""/>
-                <default field="direction_arrow" expression=""/>
-                <default field="x_symbol" expression=""/>
-                <default field="y_symbol" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="feature_type" expression=""/>
-                <default field="state" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="distance"/>
+                <default expression="" field="depth"/>
+                <default expression="" field="x_label"/>
+                <default expression="" field="y_label"/>
+                <default expression="" field="rotation_label"/>
+                <default expression="" field="offset_label"/>
+                <default expression="" field="direction_arrow"/>
+                <default expression="" field="x_symbol"/>
+                <default expression="" field="y_symbol"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="feature_type"/>
+                <default expression="" field="state"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>1</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Sample point" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" layerid="v_edit_samplepoint20170619120830016">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="1" simplifyAlgorithm="0" maximumScale="5000" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='sample_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_samplepoint&quot; (the_geom) sql=" provider="postgres" name="Sample point" layerid="v_edit_samplepoint20170619120830016">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="5000" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="sample_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="lab_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="feature_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="featurecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="dma_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="dma_id" notNull="0" Layer="v_edit_dma20180201085045064" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="dma_id" labelOnTop="0" Layer="v_edit_dma20180201085045064" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="macrodma_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="presszonecat_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="state">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_state20160216123517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_state20160216123517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="builtdate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="DateTime" name="enddate">
-                  <widgetv2config constraint="" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" fieldEditable="1" labelOnTop="0" notNull="0" allow_null="1" constraintDescription=""/>
+                  <widgetv2config labelOnTop="0" field_format="yyyy-MM-dd" display_format="yyyy-MM-dd" calendar_popup="1" notNull="0" constraint="" fieldEditable="1" allow_null="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="workcat_id_end">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="cat_work20160216122620842" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="cat_work20160216122620842" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="rotation">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="muni_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="muni_id" notNull="0" Layer="ext_municipality20171204170633784" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="muni_id" labelOnTop="0" Layer="ext_municipality20171204170633784" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="streetaxis_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="ext_streetaxis20160528211138508" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="ext_streetaxis20160528211138508" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="postnumber">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="postnumber" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="postnumber" notNull="0" Layer="ext_address20171204171433160" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="postnumber" labelOnTop="0" Layer="ext_address20171204171433160" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="postnumber"/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis2_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcomplement2">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="place_name">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="cabinet">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observations">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="verified">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="id" AllowNull="0" fieldEditable="1" labelOnTop="0" Key="id" notNull="0" Layer="value_verified20160216164517266" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="id" labelOnTop="0" Layer="value_verified20160216164517266" AllowNull="0" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="id"/>
                 </edittype>
                 <edittype widgetv2type="ValueRelation" name="expl_id">
-                  <widgetv2config constraint="" AllowMulti="0" UseCompleter="0" Value="name" AllowNull="1" fieldEditable="1" labelOnTop="0" Key="expl_id" notNull="0" Layer="exploitation20180122152954062" OrderByValue="0" FilterExpression="" constraintDescription=""/>
+                  <widgetv2config OrderByValue="0" FilterExpression="" Key="expl_id" labelOnTop="0" Layer="exploitation20180122152954062" AllowNull="1" UseCompleter="0" notNull="0" constraint="" fieldEditable="1" AllowMulti="0" constraintDescription="" Value="name"/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="166,206,227,255"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="name" v="square"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="area"/>
-                      <prop k="size" v="3"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="166,206,227,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="square" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="area" k="scale_method"/>
+                      <prop v="3" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                     <layer locked="0" pass="0" class="FontMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="chr" v="M"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="font" v="Dingbats"/>
-                      <prop k="horizontal_anchor_point" v="1"/>
-                      <prop k="joinstyle" v="miter"/>
-                      <prop k="offset" v="0,-0.40000000000000002"/>
-                      <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="255,255,255,255"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="size" v="2.25"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="M" k="chr"/>
+                      <prop v="0,0,0,255" k="color"/>
+                      <prop v="Dingbats" k="font"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="miter" k="joinstyle"/>
+                      <prop v="0,-0.40000000000000002" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="255,255,255,255" k="outline_color"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="2.25" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -18586,85 +18807,85 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <LinearlyInterpolatedDiagramRenderer classificationAttributeExpression="" upperValue="0" attributeLegend="1" upperHeight="50" lowerValue="0" diagramType="Histogram" lowerWidth="0" upperWidth="50" sizeLegend="0" lowerHeight="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="100000" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <LinearlyInterpolatedDiagramRenderer lowerValue="0" upperWidth="50" sizeLegend="0" classificationAttributeExpression="" lowerHeight="0" upperValue="0" attributeLegend="1" upperHeight="50" diagramType="Histogram" lowerWidth="0">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="100000" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </LinearlyInterpolatedDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="sample_id" name="" index="0"/>
-                <alias field="code" name="" index="1"/>
-                <alias field="lab_code" name="" index="2"/>
-                <alias field="feature_id" name="" index="3"/>
-                <alias field="featurecat_id" name="" index="4"/>
-                <alias field="dma_id" name="" index="5"/>
-                <alias field="macrodma_id" name="" index="6"/>
-                <alias field="presszonecat_id" name="" index="7"/>
-                <alias field="state" name="" index="8"/>
-                <alias field="builtdate" name="" index="9"/>
-                <alias field="enddate" name="" index="10"/>
-                <alias field="workcat_id" name="" index="11"/>
-                <alias field="workcat_id_end" name="" index="12"/>
-                <alias field="rotation" name="" index="13"/>
-                <alias field="muni_id" name="" index="14"/>
-                <alias field="streetaxis_id" name="" index="15"/>
-                <alias field="postnumber" name="" index="16"/>
-                <alias field="postcode" name="" index="17"/>
-                <alias field="streetaxis2_id" name="" index="18"/>
-                <alias field="postnumber2" name="" index="19"/>
-                <alias field="postcomplement" name="" index="20"/>
-                <alias field="postcomplement2" name="" index="21"/>
-                <alias field="place_name" name="" index="22"/>
-                <alias field="cabinet" name="" index="23"/>
-                <alias field="observations" name="" index="24"/>
-                <alias field="verified" name="" index="25"/>
-                <alias field="expl_id" name="" index="26"/>
+                <alias name="" field="sample_id" index="0"/>
+                <alias name="" field="code" index="1"/>
+                <alias name="" field="lab_code" index="2"/>
+                <alias name="" field="feature_id" index="3"/>
+                <alias name="" field="featurecat_id" index="4"/>
+                <alias name="" field="dma_id" index="5"/>
+                <alias name="" field="macrodma_id" index="6"/>
+                <alias name="" field="presszonecat_id" index="7"/>
+                <alias name="" field="state" index="8"/>
+                <alias name="" field="builtdate" index="9"/>
+                <alias name="" field="enddate" index="10"/>
+                <alias name="" field="workcat_id" index="11"/>
+                <alias name="" field="workcat_id_end" index="12"/>
+                <alias name="" field="rotation" index="13"/>
+                <alias name="" field="muni_id" index="14"/>
+                <alias name="" field="streetaxis_id" index="15"/>
+                <alias name="" field="postnumber" index="16"/>
+                <alias name="" field="postcode" index="17"/>
+                <alias name="" field="streetaxis2_id" index="18"/>
+                <alias name="" field="postnumber2" index="19"/>
+                <alias name="" field="postcomplement" index="20"/>
+                <alias name="" field="postcomplement2" index="21"/>
+                <alias name="" field="place_name" index="22"/>
+                <alias name="" field="cabinet" index="23"/>
+                <alias name="" field="observations" index="24"/>
+                <alias name="" field="verified" index="25"/>
+                <alias name="" field="expl_id" index="26"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -18696,85 +18917,85 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="sample_id" expression=""/>
-                <default field="code" expression=""/>
-                <default field="lab_code" expression=""/>
-                <default field="feature_id" expression=""/>
-                <default field="featurecat_id" expression=""/>
-                <default field="dma_id" expression=""/>
-                <default field="macrodma_id" expression=""/>
-                <default field="presszonecat_id" expression=""/>
-                <default field="state" expression=""/>
-                <default field="builtdate" expression=""/>
-                <default field="enddate" expression=""/>
-                <default field="workcat_id" expression=""/>
-                <default field="workcat_id_end" expression=""/>
-                <default field="rotation" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis2_id" expression=""/>
-                <default field="postnumber2" expression=""/>
-                <default field="postcomplement" expression=""/>
-                <default field="postcomplement2" expression=""/>
-                <default field="place_name" expression=""/>
-                <default field="cabinet" expression=""/>
-                <default field="observations" expression=""/>
-                <default field="verified" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="sample_id"/>
+                <default expression="" field="code"/>
+                <default expression="" field="lab_code"/>
+                <default expression="" field="feature_id"/>
+                <default expression="" field="featurecat_id"/>
+                <default expression="" field="dma_id"/>
+                <default expression="" field="macrodma_id"/>
+                <default expression="" field="presszonecat_id"/>
+                <default expression="" field="state"/>
+                <default expression="" field="builtdate"/>
+                <default expression="" field="enddate"/>
+                <default expression="" field="workcat_id"/>
+                <default expression="" field="workcat_id_end"/>
+                <default expression="" field="rotation"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis2_id"/>
+                <default expression="" field="postnumber2"/>
+                <default expression="" field="postcomplement"/>
+                <default expression="" field="postcomplement2"/>
+                <default expression="" field="place_name"/>
+                <default expression="" field="cabinet"/>
+                <default expression="" field="observations"/>
+                <default expression="" field="verified"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "sample_id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Address" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_address20180201103159332">
-            <qgis version="2.18.14" simplifyDrawingHints="0" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1500" hasScaleBasedVisibilityFlag="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_address&quot; (the_geom) sql=" provider="postgres" name="Address" layerid="v_ext_address20180201103159332">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="1" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1500" simplifyAlgorithm="0" simplifyDrawingHints="0">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="marker">
+                  <symbol type="marker" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleMarker">
-                      <prop k="angle" v="0"/>
-                      <prop k="color" v="229,241,175,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="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="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="scale_method" v="diameter"/>
-                      <prop k="size" v="5"/>
-                      <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="size_unit" v="MM"/>
-                      <prop k="vertical_anchor_point" v="1"/>
+                      <prop v="0" k="angle"/>
+                      <prop v="229,241,175,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="5" k="size"/>
+                      <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -18933,74 +19154,74 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="-1" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="-1" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="muni_id" name="" index="1"/>
-                <alias field="postcode" name="" index="2"/>
-                <alias field="streetaxis_id" name="" index="3"/>
-                <alias field="postnumber" name="" index="4"/>
-                <alias field="plot_id" name="" index="5"/>
-                <alias field="expl_id" name="" index="6"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="muni_id" index="1"/>
+                <alias name="" field="postcode" index="2"/>
+                <alias name="" field="streetaxis_id" index="3"/>
+                <alias name="" field="postnumber" index="4"/>
+                <alias name="" field="plot_id" index="5"/>
+                <alias name="" field="expl_id" index="6"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns>
-                  <column name="id" hidden="0" width="-1" type="field"/>
-                  <column name="muni_id" hidden="0" width="-1" type="field"/>
-                  <column name="postcode" hidden="0" width="-1" type="field"/>
-                  <column name="streetaxis_id" hidden="0" width="-1" type="field"/>
-                  <column name="postnumber" hidden="0" width="-1" type="field"/>
-                  <column name="plot_id" hidden="0" width="-1" type="field"/>
-                  <column name="expl_id" hidden="0" width="-1" type="field"/>
-                  <column hidden="1" width="-1" type="actions"/>
+                  <column type="field" width="-1" hidden="0" name="id"/>
+                  <column type="field" width="-1" hidden="0" name="muni_id"/>
+                  <column type="field" width="-1" hidden="0" name="postcode"/>
+                  <column type="field" width="-1" hidden="0" name="streetaxis_id"/>
+                  <column type="field" width="-1" hidden="0" name="postnumber"/>
+                  <column type="field" width="-1" hidden="0" name="plot_id"/>
+                  <column type="field" width="-1" hidden="0" name="expl_id"/>
+                  <column type="actions" width="-1" hidden="1"/>
                 </columns>
               </attributetableconfig>
               <editform>..</editform>
@@ -19032,73 +19253,73 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="plot_id" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="plot_id"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
               <layerGeometryType>0</layerGeometryType>
             </qgis>
           </LayerStyle>
-          <LayerStyle name="Plot" source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" layerid="v_ext_plot20180201103159443">
-            <qgis version="2.18.14" simplifyDrawingHints="1" minLabelScale="0" scaleBasedLabelVisibilityFlag="0" simplifyMaxScale="1" minimumScale="0" simplifyAlgorithm="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" simplifyLocal="1">
+          <LayerStyle source="dbname='__DBNAME__' host=__HOST__ port=__PORT__ sslmode=disable key='id' srid=__SRID__ type=MultiPolygon checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_ext_plot&quot; (the_geom) sql=" provider="postgres" name="Plot" layerid="v_ext_plot20180201103159443">
+            <qgis readOnly="0" simplifyMaxScale="1" simplifyDrawingTol="1" version="2.18.14" simplifyLocal="1" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0" minLabelScale="0" maximumScale="1e+08" simplifyAlgorithm="0" simplifyDrawingHints="1">
               <edittypes>
                 <edittype widgetv2type="TextEdit" name="id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="plot_code">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="muni_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postcode">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="streetaxis_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="postnumber">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="complement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="placement">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="square">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="observ">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="text">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
                 <edittype widgetv2type="TextEdit" name="expl_id">
-                  <widgetv2config constraint="" IsMultiline="0" fieldEditable="1" labelOnTop="0" notNull="0" UseHtml="0" constraintDescription=""/>
+                  <widgetv2config IsMultiline="0" labelOnTop="0" UseHtml="0" notNull="0" constraint="" fieldEditable="1" constraintDescription=""/>
                 </edittype>
               </edittypes>
-              <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+              <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
                 <symbols>
-                  <symbol name="0" alpha="1" clip_to_extent="1" type="fill">
+                  <symbol type="fill" alpha="1" name="0" clip_to_extent="1">
                     <layer locked="0" pass="0" class="SimpleFill">
-                      <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-                      <prop k="color" v="223,223,200,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="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="solid"/>
-                      <prop k="outline_width" v="0.26"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
+                      <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="223,223,200,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="0,0,0,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0.26" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
                     </layer>
                   </symbol>
                 </symbols>
@@ -19257,70 +19478,70 @@ def my_form_open(dialog, layer, feature):
                 <label fieldname="" text="Label"/>
                 <family fieldname="" name="MS Shell Dlg 2"/>
                 <size fieldname="" units="pt" value="12"/>
-                <bold fieldname="" on="0"/>
-                <italic fieldname="" on="0"/>
-                <underline fieldname="" on="0"/>
-                <strikeout fieldname="" on="0"/>
-                <color fieldname="" blue="0" green="0" red="0"/>
+                <bold on="0" fieldname=""/>
+                <italic on="0" fieldname=""/>
+                <underline on="0" fieldname=""/>
+                <strikeout on="0" fieldname=""/>
+                <color fieldname="" green="0" red="0" blue="0"/>
                 <x fieldname=""/>
                 <y fieldname=""/>
-                <offset x="0" units="pt" xfieldname="" y="0" yfieldname=""/>
+                <offset yfieldname="" x="0" units="pt" y="0" xfieldname=""/>
                 <angle fieldname="" auto="0" value="0"/>
                 <alignment fieldname="" value="center"/>
-                <buffercolor fieldname="" blue="255" green="255" red="255"/>
+                <buffercolor fieldname="" green="255" red="255" blue="255"/>
                 <buffersize fieldname="" units="pt" value="1"/>
-                <bufferenabled fieldname="" on=""/>
-                <multilineenabled fieldname="" on=""/>
+                <bufferenabled on="" fieldname=""/>
+                <multilineenabled on="" fieldname=""/>
                 <selectedonly on=""/>
               </labelattributes>
-              <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram" sizeLegend="0">
-                <DiagramCategory diagramOrientation="Up" scaleBasedVisibility="0" sizeScale="0,0,0,0,0,0" penAlpha="255" angleOffset="1440" minScaleDenominator="inf" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" transparency="0" labelPlacementMethod="XHeight" width="15" height="15" penColor="#000000" backgroundAlpha="255" maxScaleDenominator="1e+08" lineSizeType="MM" sizeType="MM" barWidth="5" penWidth="0" lineSizeScale="0,0,0,0,0,0" minimumSize="0">
+              <SingleCategoryDiagramRenderer sizeLegend="0" attributeLegend="1" diagramType="Histogram">
+                <DiagramCategory transparency="0" scaleDependency="Area" penWidth="0" width="15" lineSizeScale="0,0,0,0,0,0" maxScaleDenominator="1e+08" enabled="0" backgroundAlpha="255" sizeScale="0,0,0,0,0,0" backgroundColor="#ffffff" penColor="#000000" labelPlacementMethod="XHeight" minimumSize="0" barWidth="5" diagramOrientation="Up" angleOffset="1440" lineSizeType="MM" sizeType="MM" penAlpha="255" minScaleDenominator="inf" height="15" scaleBasedVisibility="0">
                   <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-                  <attribute label="" color="#000000" field=""/>
+                  <attribute field="" label="" color="#000000"/>
                 </DiagramCategory>
-                <symbol name="sizeSymbol" alpha="1" clip_to_extent="1" type="marker">
+                <symbol type="marker" alpha="1" name="sizeSymbol" clip_to_extent="1">
                   <layer locked="0" pass="0" class="SimpleMarker">
-                    <prop k="angle" v="0"/>
-                    <prop k="color" v="255,0,0,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="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="solid"/>
-                    <prop k="outline_width" v="0"/>
-                    <prop k="outline_width_map_unit_scale" v="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="0,0,0,0,0,0"/>
-                    <prop k="size_unit" v="MM"/>
-                    <prop k="vertical_anchor_point" v="1"/>
+                    <prop v="0" k="angle"/>
+                    <prop v="255,0,0,255" k="color"/>
+                    <prop v="1" k="horizontal_anchor_point"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="circle" k="name"/>
+                    <prop v="0,0" k="offset"/>
+                    <prop v="0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0,0,0,255" k="outline_color"/>
+                    <prop v="solid" k="outline_style"/>
+                    <prop v="0" k="outline_width"/>
+                    <prop v="0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                    <prop v="MM" k="outline_width_unit"/>
+                    <prop v="diameter" k="scale_method"/>
+                    <prop v="2" k="size"/>
+                    <prop v="0,0,0,0,0,0" k="size_map_unit_scale"/>
+                    <prop v="MM" k="size_unit"/>
+                    <prop v="1" k="vertical_anchor_point"/>
                   </layer>
                 </symbol>
               </SingleCategoryDiagramRenderer>
-              <DiagramLayerSettings xPosColumn="-1" priority="0" dist="0" yPosColumn="-1" obstacle="0" placement="0" zIndex="0" showAll="1" showColumn="0" linePlacementFlags="10"/>
+              <DiagramLayerSettings linePlacementFlags="10" obstacle="0" showAll="1" showColumn="0" zIndex="0" dist="0" xPosColumn="-1" priority="0" yPosColumn="-1" placement="0"/>
               <annotationform>..</annotationform>
               <aliases>
-                <alias field="id" name="" index="0"/>
-                <alias field="plot_code" name="" index="1"/>
-                <alias field="muni_id" name="" index="2"/>
-                <alias field="postcode" name="" index="3"/>
-                <alias field="streetaxis_id" name="" index="4"/>
-                <alias field="postnumber" name="" index="5"/>
-                <alias field="complement" name="" index="6"/>
-                <alias field="placement" name="" index="7"/>
-                <alias field="square" name="" index="8"/>
-                <alias field="observ" name="" index="9"/>
-                <alias field="text" name="" index="10"/>
-                <alias field="expl_id" name="" index="11"/>
+                <alias name="" field="id" index="0"/>
+                <alias name="" field="plot_code" index="1"/>
+                <alias name="" field="muni_id" index="2"/>
+                <alias name="" field="postcode" index="3"/>
+                <alias name="" field="streetaxis_id" index="4"/>
+                <alias name="" field="postnumber" index="5"/>
+                <alias name="" field="complement" index="6"/>
+                <alias name="" field="placement" index="7"/>
+                <alias name="" field="square" index="8"/>
+                <alias name="" field="observ" index="9"/>
+                <alias name="" field="text" index="10"/>
+                <alias name="" field="expl_id" index="11"/>
               </aliases>
               <exclSCHEMA_NAMEeAttributesWMS/>
               <exclSCHEMA_NAMEeAttributesWFS/>
               <attributeactions default="-1"/>
-              <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+              <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
                 <columns/>
               </attributetableconfig>
               <editform>..</editform>
@@ -19352,116 +19573,116 @@ def my_form_open(dialog, layer, feature):
                 <fieldstyles/>
               </conditionalstyles>
               <defaults>
-                <default field="id" expression=""/>
-                <default field="plot_code" expression=""/>
-                <default field="muni_id" expression=""/>
-                <default field="postcode" expression=""/>
-                <default field="streetaxis_id" expression=""/>
-                <default field="postnumber" expression=""/>
-                <default field="complement" expression=""/>
-                <default field="placement" expression=""/>
-                <default field="square" expression=""/>
-                <default field="observ" expression=""/>
-                <default field="text" expression=""/>
-                <default field="expl_id" expression=""/>
+                <default expression="" field="id"/>
+                <default expression="" field="plot_code"/>
+                <default expression="" field="muni_id"/>
+                <default expression="" field="postcode"/>
+                <default expression="" field="streetaxis_id"/>
+                <default expression="" field="postnumber"/>
+                <default expression="" field="complement"/>
+                <default expression="" field="placement"/>
+                <default expression="" field="square"/>
+                <default expression="" field="observ"/>
+                <default expression="" field="text"/>
+                <default expression="" field="expl_id"/>
               </defaults>
               <previewExpression/>
               <layerGeometryType>2</layerGeometryType>
             </qgis>
           </LayerStyle>
         </LayerStyles>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{5ae158ae-1ace-48d2-80d9-90bf273b13ae}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" name="Vista general 1" position="3" frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" blendMode="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" centered="0">
-          <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-            <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,0,0,75"/>
-              <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="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+        <ComposerMapOverview frameMap="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" inverted="0" uuid="{40581842-8e96-4404-83c9-ec956948f98d}" blendMode="0" centered="0" name="Vista general 1" position="3" show="1">
+          <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,0,0,75" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19469,9 +19690,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -19480,399 +19701,399 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{04100234-7357-49e1-9d15-b7949d417719}" blendMode="0" position="17.1613,22.2695,mm" zValue="16" frameJoinStyle="miter" visibility="1" id="" size="179.415,2.75637,mm" positionOnPage="17.1613,22.2695,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.1613,22.2695,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.415,2.75637,mm" id="" templateUuid="{04100234-7357-49e1-9d15-b7949d417719}" position="17.1613,22.2695,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="16" itemRotation="0" outlineWidthM="0.3,mm" uuid="{04100234-7357-49e1-9d15-b7949d417719}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" labelText="[% &quot;observ&quot; %]" halign="1" blendMode="0" position="40.013,223.173,mm" zValue="15" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="149.138,11.1067,mm" positionOnPage="40.013,223.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="40.013,223.173,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;observ&quot; %]" excludeFromExports="0" size="149.138,11.1067,mm" id="" templateUuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" position="40.013,223.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="15" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7fe652d8-2ca8-4911-84e7-09f44fadf8b3}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1" frame="false" excludeFromExports="0" marginY="1" outlineWidthM="0.3,mm" positionLock="false" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" labelText="[% &quot;descript&quot; %]" halign="1" blendMode="0" position="37.635,212.191,mm" zValue="14" marginX="1" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="153.454,10.5555,mm" positionOnPage="37.635,212.191,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="37.635,212.191,mm" marginX="1" halign="1" frameJoinStyle="miter" marginY="1" valign="32" referencePoint="0" labelText="[% &quot;descript&quot; %]" excludeFromExports="0" size="153.454,10.5555,mm" id="" templateUuid="{4428313a-729a-4e84-868e-0e79544a57fe}" position="37.635,212.191,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="14" itemRotation="0" outlineWidthM="0.3,mm" uuid="{4428313a-729a-4e84-868e-0e79544a57fe}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" halign="1" blendMode="0" position="18.472,191.26,mm" zValue="13" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="77.862,4.52331,mm" positionOnPage="18.472,191.26,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,191.26,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total bSCHEMA_NAMEget per contract (PEC IVA inclSCHEMA_NAMEed):" excludeFromExports="0" size="77.862,4.52331,mm" id="" templateUuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" position="18.472,191.26,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="13" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2cfabc59-b775-4022-a3fe-5bd1db3f55ab}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" labelText="Observations:" halign="1" blendMode="0" position="18.2394,224.173,mm" zValue="12" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="24.3323,3.60837,mm" positionOnPage="18.2394,224.173,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.2394,224.173,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Observations:" excludeFromExports="0" size="24.3323,3.60837,mm" id="" templateUuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" position="18.2394,224.173,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="12" itemRotation="0" outlineWidthM="0.3,mm" uuid="{8f67f89d-12f1-479a-ab9d-6067da071fe0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" halign="1" blendMode="0" position="18.472,184.169,mm" zValue="11" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="63.839,5.87319,mm" positionOnPage="18.472,184.169,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,184.169,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="BSCHEMA_NAMEget of Material Execution (PEM):" excludeFromExports="0" size="63.839,5.87319,mm" id="" templateUuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" position="18.472,184.169,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="11" itemRotation="0" outlineWidthM="0.3,mm" uuid="{9a235067-fe1b-4381-b763-4606e1d7f8ee}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65640" referencePoint="0" groupUuid="" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" svgBorderWidth="0" frame="false" anchorPoint="0" pictureWidth="5.27855" excludeFromExports="0" svgBorderColor="255,255,255,255" northOffset="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" pictureRotation="90" file="arrows/NorthArrow_10.svg" resizeMode="0" blendMode="0" position="186.801,128.951,mm" zValue="10" pictureHeight="6.83615" frameJoinStyle="miter" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" visibility="1" svgFillColor="0,0,0,255" id="compass" size="6.83615,6.83615,mm" northMode="0" positionOnPage="186.801,128.951,mm" itemRotation="0" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="128" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="186.801,128.951,mm" pictureHeight="6.83615" pictureWidth="5.27855" svgBorderColor="255,255,255,255" frameJoinStyle="miter" resizeMode="0" northMode="0" northOffset="0" referencePoint="0" excludeFromExports="0" mapUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" anchorPoint="0" size="6.83615,6.83615,mm" id="compass" templateUuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" svgFillColor="0,0,0,255" position="186.801,128.951,mm" background="true" svgBorderWidth="0" type="65640" positionLock="false" visibility="1" pictureRotation="90" groupUuid="" frame="false" zValue="10" itemRotation="0" outlineWidthM="0.3,mm" uuid="{46085575-9bf2-4275-ac99-d9a2ada946e9}" opacity="1" file="arrows/NorthArrow_10.svg">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="128" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" labelText="Total cost for arc elements:" halign="1" blendMode="0" position="18.472,154.849,mm" zValue="9" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="53.284,5.87319,mm" positionOnPage="18.472,154.849,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.472,154.849,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Total cost for arc elements:" excludeFromExports="0" size="53.284,5.87319,mm" id="" templateUuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" position="18.472,154.849,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="9" itemRotation="0" outlineWidthM="0.3,mm" uuid="{68c94070-2aca-4ce9-8bde-5215f9aa9430}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" labelText="Description:" halign="1" blendMode="0" position="18.4712,213.104,mm" zValue="8" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="20.5677,5.87319,mm" positionOnPage="18.4712,213.104,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,213.104,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Description:" excludeFromExports="0" size="20.5677,5.87319,mm" id="" templateUuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" position="18.4712,213.104,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="8" itemRotation="0" outlineWidthM="0.3,mm" uuid="{7b7a9ec0-4ba6-400d-9feb-3124ddc38327}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1" frame="false" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" labelText="Priority:  [% &quot;priority&quot; %]" halign="1" blendMode="0" position="18.4712,206.23,mm" zValue="7" marginX="0" frameJoinStyle="miter" visibility="1" id="" htmlState="0" valign="32" size="96.1108,5.87319,mm" positionOnPage="18.4712,206.23,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.4712,206.23,mm" marginX="0" halign="1" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="Priority:  [% &quot;priority&quot; %]" excludeFromExports="0" size="96.1108,5.87319,mm" id="" templateUuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" position="18.4712,206.23,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="false" zValue="7" itemRotation="0" outlineWidthM="0.3,mm" uuid="{99b44d44-e9e3-4d95-9069-ba99d182b838}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,50,1,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,50,1,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" blendMode="0" position="17.603,287.775,mm" zValue="6" frameJoinStyle="miter" visibility="1" id="" size="179.614,0.746,mm" positionOnPage="17.603,287.775,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.603,287.775,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="179.614,0.746,mm" id="" templateUuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" position="17.603,287.775,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="6" itemRotation="0" outlineWidthM="0.3,mm" uuid="{aca5f13e-1d8f-470c-8864-a7b49e5be495}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1" frame="false" sectionHeight="6.16796" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" sectionX="0" blendMode="0" position="62.9048,188.347,mm" zValue="5" frameJoinStyle="miter" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,6.16796,mm" positionOnPage="62.9048,188.347,mm" itemRotation="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,188.347,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" sectionHeight="6.16796" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" size="44,6.16796,mm" id="" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" position="62.9048,188.347,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="5" itemRotation="0" outlineWidthM="0.3,mm" uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65647" referencePoint="0" groupUuid="" sectionY="0" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1" frame="false" sectionHeight="5.9" hideBackgroundIfEmpty="0" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" sectionX="0" blendMode="0" position="62.9048,182.447,mm" zValue="4" frameJoinStyle="miter" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" visibility="1" sectionWidth="44" id="" hidePageIfEmpty="0" size="44,5.9,mm" positionOnPage="62.9048,182.447,mm" itemRotation="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="62.9048,182.447,mm" sectionWidth="44" frameJoinStyle="miter" hideBackgroundIfEmpty="0" multiFrame="{de71cb9c-06b4-46e4-919a-69c24d028baa}" sectionHeight="5.9" referencePoint="0" excludeFromExports="0" multiFrameTemplateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" size="44,5.9,mm" id="" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" position="62.9048,182.447,mm" background="false" sectionX="0" type="65647" positionLock="false" visibility="1" hidePageIfEmpty="0" groupUuid="" sectionY="0" frame="false" zValue="4" itemRotation="0" outlineWidthM="0.3,mm" uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65643" referencePoint="0" groupUuid="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1" cornerRadiusMeasure="0,mm" frame="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" blendMode="0" position="17.7113,33.9068,mm" zValue="3" frameJoinStyle="miter" visibility="1" id="" size="178.865,0.746323,mm" positionOnPage="17.7113,33.9068,mm" itemRotation="0" shapeType="1" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="17.7113,33.9068,mm" frameJoinStyle="miter" shapeType="1" referencePoint="0" excludeFromExports="0" size="178.865,0.746323,mm" id="" templateUuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" position="17.7113,33.9068,mm" background="false" cornerRadiusMeasure="0,mm" type="65643" positionLock="false" visibility="1" groupUuid="" frame="false" zValue="3" itemRotation="0" outlineWidthM="0.3,mm" uuid="{775f4bca-afa7-4422-84f5-787fcdadc9d9}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="fill">
-          <layer locked="0" enabled="1" class="SimpleFill" pass="0">
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="31,120,180,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="no"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
+        <symbol type="fill" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="31,120,180,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem type="65641" referencePoint="0" groupUuid="" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1" frame="true" excludeFromExports="0" marginY="0" outlineWidthM="0.3,mm" positionLock="false" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" labelText="" halign="4" blendMode="0" position="85.0548,26.9871,mm" zValue="2" marginX="0" frameJoinStyle="miter" visibility="1" id="title" htmlState="0" valign="32" size="49.4242,4.61973,mm" positionOnPage="85.0548,26.9871,mm" itemRotation="0" background="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="85.0548,26.9871,mm" marginX="0" halign="4" frameJoinStyle="miter" marginY="0" valign="32" referencePoint="0" labelText="" excludeFromExports="0" size="49.4242,4.61973,mm" id="title" templateUuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" position="85.0548,26.9871,mm" background="false" type="65641" positionLock="false" visibility="1" groupUuid="" htmlState="0" frame="true" zValue="2" itemRotation="0" outlineWidthM="0.3,mm" uuid="{2446e508-dd25-44e0-92bd-f835ce17dcb7}" opacity="1">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont style="" description="Arial,10,-1,5,75,0,0,0,0,0"/>
-        <FontColor alpha="255" blue="0" green="0" red="0"/>
+        <LabelFont description="Arial,10,-1,5,75,0,0,0,0,0" style=""/>
+        <FontColor alpha="255" green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem mapRotation="0" type="65639" referencePoint="0" groupUuid="" drawCanvasItems="false" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" frame="true" followPresetName="" excludeFromExports="0" outlineWidthM="0.2,mm" positionLock="false" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" mapFlags="0" blendMode="0" position="18.572,40.2423,mm" zValue="1" frameJoinStyle="miter" visibility="1" followPreset="false" id="map" size="177.676,98.3225,mm" keepLayerSet="false" positionOnPage="18.572,40.2423,mm" itemRotation="0" background="true" labelMargin="0,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem blendMode="0" positionOnPage="18.572,40.2423,mm" mapFlags="0" frameJoinStyle="miter" followPresetName="" referencePoint="0" keepLayerSet="false" excludeFromExports="0" size="177.676,98.3225,mm" id="map" mapRotation="0" templateUuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" position="18.572,40.2423,mm" background="true" type="65639" positionLock="false" visibility="1" groupUuid="" frame="true" followPreset="false" zValue="1" itemRotation="0" outlineWidthM="0.2,mm" uuid="{4af0a8ee-f00e-4ef6-91ba-4efcdc42c9fe}" opacity="1" drawCanvasItems="false" labelMargin="0,mm">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapAtlasMargin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapAtlasMargin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;rotation&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;rotation&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="&quot;scale&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="&quot;scale&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="4576677.90777442045509815" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymin="4576604.16589934565126896"/>
+        <Extent ymin="4576604.16589934565126896" xmax="419196.24566398735623807" xmin="419062.98866385139990598" ymax="4576677.90777442045509815"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" topFrameDivisions="0" annotationPrecision="3" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetX="0" maximumIntervalWidth="100" leftAnnotationDirection="0" bottomAnnotationPosition="1" rightAnnotationPosition="1" bottomFrameDivisions="0" rightFrameDivisions="0" intervalY="0" frameFillColor1="255,255,255,255" name="Cuadr�cula 1" frameAnnotationDistance="1" leftFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationPosition="1" position="3" gridFrameWidth="2" annotationFormat="0" crossLength="3" gridFrameMargin="0" gridFrameSideFlags="15" showAnnotation="0" unit="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" intervalX="0" leftAnnotationDisplay="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDisplay="0" minimumIntervalWidth="50" gridFrameStyle="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" show="0" annotationFontColor="0,0,0,255" annotationExpression="" gridStyle="0" blendMode="0" offsetY="0" topAnnotationDirection="0">
+        <ComposerMapGrid gridFrameSideFlags="15" showAnnotation="0" frameAnnotationDistance="1" annotationFontColor="0,0,0,255" gridStyle="0" leftAnnotationDirection="0" crossLength="3" topAnnotationDirection="0" minimumIntervalWidth="50" rightFrameDivisions="0" uuid="{72a1125d-5ad0-40d1-a6cc-626153547c81}" rightAnnotationDirection="0" topAnnotationDisplay="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" rightAnnotationPosition="1" intervalX="0" offsetY="0" gridFrameMargin="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" blendMode="0" unit="0" annotationExpression="" frameFillColor1="255,255,255,255" gridFramePenColor="0,0,0,255" offsetX="0" annotationFormat="0" gridFramePenThickness="0.5" position="3" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" name="Cuadr�cula 1" intervalY="0" gridFrameStyle="0" topAnnotationPosition="1" show="0" gridFrameWidth="2" rightAnnotationDisplay="0" maximumIntervalWidth="100" leftFrameDivisions="0" annotationPrecision="3">
           <lineStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="line">
-              <layer locked="0" enabled="1" class="SimpleLine" pass="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="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <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="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol type="line" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                <prop v="square" k="capstyle"/>
+                <prop v="5;2" k="customdash"/>
+                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0,0,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" clip_to_extent="1" force_rhr="0" type="marker">
-              <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                <prop k="angle" v="0"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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"/>
+            <symbol type="marker" alpha="1" force_rhr="0" name="" clip_to_extent="1">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+                <prop v="0" k="angle"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+          <annotationFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -19881,198 +20102,198 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.2" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" horizontalGrid="1" gridStrokeWidth="0.2" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{de71cb9c-06b4-46e4-919a-69c24d028baa}" filterToAtlasIntersection="0">
         <childFrame uuid="{460f3137-5033-42c5-b76e-c0a36b10d701}" templateUuid="{460f3137-5033-42c5-b76e-c0a36b10d701}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame showUniqueRowsOnly="0" featureFilter="" type="65649" headerHAlignment="3" gridStrokeWidth="0.5" filterFeatures="false" contentFontColor="0,0,0,255" horizontalGrid="1" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" verticalGrid="1" gridColor="0,0,0,255" backgroundColor="255,255,255,255" showEmptyRows="0" wrapBehavior="0" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0" resizeMode="0" maxFeatures="30" showGrid="0" relationId="" showOnlyVisibleFeatures="0" headerMode="2" emptyTableMessage="" cellMargin="1" source="0" wrapString="" emptyTableMode="0" headerFontColor="0,0,0,255">
+      <LayoutMultiFrame maxFeatures="30" showGrid="0" headerHAlignment="3" filterFeatures="false" emptyTableMode="0" resizeMode="0" showOnlyVisibleFeatures="0" showEmptyRows="0" headerMode="2" headerFontColor="0,0,0,255" relationId="" verticalGrid="1" gridColor="0,0,0,255" templateUuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" horizontalGrid="1" gridStrokeWidth="0.5" featureFilter="" wrapBehavior="0" type="65649" backgroundColor="255,255,255,255" showUniqueRowsOnly="0" contentFontColor="0,0,0,255" emptyTableMessage="" wrapString="" source="0" cellMargin="1" uuid="{cf78a45a-2531-4b8f-85cf-0f1b70867f0a}" filterToAtlasIntersection="0">
         <childFrame uuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}" templateUuid="{f084ab12-412c-4d7e-a926-e49d91f85bb0}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <headerFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
-        <contentFontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+        <headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+        <contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_id" width="0" sortByRank="0" heading="psector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="name" width="0" sortByRank="0" heading="name">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="name" sortOrder="0" hAlignment="1" sortByRank="0" heading="name" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="psector_type" width="0" sortByRank="0" heading="psector_type">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="psector_type" sortOrder="0" hAlignment="1" sortByRank="0" heading="psector_type" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="descript" width="0" sortByRank="0" heading="descript">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="descript" sortOrder="0" hAlignment="1" sortByRank="0" heading="descript" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="priority" width="0" sortByRank="0" heading="priority">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="priority" sortOrder="0" hAlignment="1" sortByRank="0" heading="priority" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_arc" width="0" sortByRank="0" heading="total_arc">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_arc" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_arc" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_node" width="0" sortByRank="0" heading="total_node">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_node" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_node" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="total_other" width="0" sortByRank="0" heading="total_other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="total_other" sortOrder="0" hAlignment="1" sortByRank="0" heading="total_other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text1" width="0" sortByRank="0" heading="text1">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text1" sortOrder="0" hAlignment="1" sortByRank="0" heading="text1" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="text2" width="0" sortByRank="0" heading="text2">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="text2" sortOrder="0" hAlignment="1" sortByRank="0" heading="text2" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="observ" width="0" sortByRank="0" heading="observ">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="observ" sortOrder="0" hAlignment="1" sortByRank="0" heading="observ" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="rotation" width="0" sortByRank="0" heading="rotation">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="rotation" sortOrder="0" hAlignment="1" sortByRank="0" heading="rotation" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="scale" width="0" sortByRank="0" heading="scale">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="scale" sortOrder="0" hAlignment="1" sortByRank="0" heading="scale" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="sector_id" width="0" sortByRank="0" heading="sector_id">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="sector_id" sortOrder="0" hAlignment="1" sortByRank="0" heading="sector_id" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="active" width="0" sortByRank="0" heading="active">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="active" sortOrder="0" hAlignment="1" sortByRank="0" heading="active" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pem" width="0" sortByRank="0" heading="pem">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pem" sortOrder="0" hAlignment="1" sortByRank="0" heading="pem" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="gexpenses" width="0" sortByRank="0" heading="gexpenses">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="gexpenses" sortOrder="0" hAlignment="1" sortByRank="0" heading="gexpenses" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec" width="0" sortByRank="0" heading="pec">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="vat" width="0" sortByRank="0" heading="vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pec_vat" width="0" sortByRank="0" heading="pec_vat">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pec_vat" sortOrder="0" hAlignment="1" sortByRank="0" heading="pec_vat" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="other" width="0" sortByRank="0" heading="other">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="other" sortOrder="0" hAlignment="1" sortByRank="0" heading="other" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
-          <column hAlignment="1" sortOrder="0" vAlignment="128" attribute="pca" width="0" sortByRank="0" heading="pca">
-            <backgroundColor alpha="0" blue="0" green="0" red="0"/>
+          <column width="0" attribute="pca" sortOrder="0" hAlignment="1" sortByRank="0" heading="pca" vAlignment="128">
+            <backgroundColor alpha="0" green="0" red="0" blue="0"/>
           </column>
         </displayColumns>
         <cellStyles>
-          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
         <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" sortAscending="1" featureFilter=" &quot;psector_id&quot; " filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="1" sortFeatures="1" pageNameExpression="" enabled="0" sortKey="psector_id"/>
+      <Atlas coverageLayer="" sortFeatures="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="psector_id" sortAscending="1" enabled="0" hideCoverage="1" featureFilter=" &quot;psector_id&quot; " filterFeatures="1" pageNameExpression=""/>
     </Layout>
   </Layouts>
   <Bookmarks/>